Sync with L2jServer HighFive Sep 8th 2015.

This commit is contained in:
MobiusDev
2015-09-08 19:52:45 +00:00
parent 4e2af7c19a
commit 40380c4860
738 changed files with 14444 additions and 13328 deletions

View File

@ -1000,10 +1000,10 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%currentload%", String.valueOf(player.getCurrentLoad()));
adminReply.replace("%maxload%", String.valueOf(player.getMaxLoad()));
adminReply.replace("%percent%", String.valueOf(Util.roundTo(((float) player.getCurrentLoad() / (float) player.getMaxLoad()) * 100, 2)));
adminReply.replace("%patk%", String.valueOf(player.getPAtk(null)));
adminReply.replace("%matk%", String.valueOf(player.getMAtk(null, null)));
adminReply.replace("%pdef%", String.valueOf(player.getPDef(null)));
adminReply.replace("%mdef%", String.valueOf(player.getMDef(null, null)));
adminReply.replace("%patk%", String.valueOf((int) player.getPAtk(null)));
adminReply.replace("%matk%", String.valueOf((int) player.getMAtk(null, null)));
adminReply.replace("%pdef%", String.valueOf((int) player.getPDef(null)));
adminReply.replace("%mdef%", String.valueOf((int) player.getMDef(null, null)));
adminReply.replace("%accuracy%", String.valueOf(player.getAccuracy()));
adminReply.replace("%evasion%", String.valueOf(player.getEvasionRate(null)));
adminReply.replace("%critical%", String.valueOf(player.getCriticalHit(null, null)));

View File

@ -222,7 +222,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
{
shld1++;
}
boolean _crit1 = Formulas.calcCrit(npc1.getCriticalHit(npc2, null), false, npc2);
boolean _crit1 = Formulas.calcCrit(npc1, npc2);
if (_crit1)
{
crit1++;
@ -255,7 +255,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
{
shld2++;
}
boolean _crit2 = Formulas.calcCrit(npc2.getCriticalHit(npc1, null), false, npc1);
boolean _crit2 = Formulas.calcCrit(npc2, npc1);
if (_crit2)
{
crit2++;

View File

@ -44,7 +44,6 @@ public class AdminHeal implements IAdminCommandHandler
@Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
if (command.equals("admin_heal"))
{
handleHeal(activeChar);