lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Dec 21st 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-12-21 11:05:04 +00:00
parent 130fa65bbd
commit 4bfbad7c46
74 changed files with 2194 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@ -34,6 +34,7 @@ import com.l2jserver.commons.database.pool.impl.ConnectionFactory;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.data.xml.impl.ClassListData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.data.xml.impl.TransformData;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.SubclassInfoType;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
@ -357,8 +358,8 @@ public class AdminEditChar implements IAdminCommandHandler
if ((ClassId.getClassId(classidval) != null) && (player.getClassId().getId() != classidval))
{
final boolean wasAwaken = player.isAwaken();
TransformData.getInstance().transformPlayer(255, player);
player.setClassId(classidval);
if (player.isSubClassActive())
{
player.getSubClasses().get(player.getClassIndex()).setClassId(player.getActiveClassId());
@ -368,16 +369,17 @@ public class AdminEditChar implements IAdminCommandHandler
player.setBaseClassId(player.getActiveClassId());
player.setInitialClassId(ClassId.getInitialClassId(player));
}
if (player.getBaseClass().getRace().equals(Race.ERTHEIA))
{
player.getAppearance().setSex(true);
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
player.storeMe();
player.sendMessage("A GM changed your class to " + newclass + ".");
player.untransform();
player.broadcastUserInfo();
activeChar.setTarget(null);
activeChar.setTarget(player);
if (!wasAwaken && player.isAwaken())
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@ -324,13 +324,13 @@ public class AdminShowQuests implements IAdminCommandHandler
QuestState qs = target.getQuestState(val[0]);
String[] outval = new String[3];
if (val[1].equals("state"))
if ("state".equals(val[1]))
{
switch (val[2])
{
case "COMPLETED":
{
qs.exitQuest((val[3].equals("1")) ? true : false);
qs.exitQuest("1".equals(val[3]));
break;
}
case "DELETE":