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

Underground update.

Browse Source
This commit is contained in:
MobiusDev
2015-11-07 01:36:06 +00:00
parent cf1f829606
commit 37dbd02716
750 changed files with 102520 additions and 58051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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.enums.Race;
import com.l2jserver.gameserver.enums.SubclassInfoType;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
@ -359,11 +360,17 @@ public class AdminEditChar implements IAdminCommandHandler
if (player.isSubClassActive())
{
player.getSubClasses().get(player.getClassIndex()).setClassId(player.getActiveClass());
player.getSubClasses().get(player.getClassIndex()).setClassId(player.getActiveClassId());
}
else
{
player.setBaseClass(player.getActiveClass());
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();
@ -991,7 +998,7 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%class%", ClassListData.getInstance().getClass(player.getClassId()).getClientCode());
adminReply.replace("%ordinal%", String.valueOf(player.getClassId().ordinal()));
adminReply.replace("%classid%", String.valueOf(player.getClassId()));
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode());
adminReply.replace("%baseclass%", ClassListData.getInstance().getClass(player.getBaseClassId()).getClientCode());
adminReply.replace("%x%", String.valueOf(player.getX()));
adminReply.replace("%y%", String.valueOf(player.getY()));
adminReply.replace("%z%", String.valueOf(player.getZ()));

2
trunk/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

@ -139,7 +139,7 @@ public final class CallPc extends AbstractEffect
if (target.inObserverMode())
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING);
sm.addCharName(target);
activeChar.sendPacket(sm);
return false;

2
trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@ -140,7 +140,7 @@ public class ItemSkillsTemplate implements IItemHandler
{
if (!playable.destroyItem("Consume", item.getObjectId(), 1, playable, false))
{
playable.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT2);
playable.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
return false;
}
}