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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
trunk/dist/game/data/scripts/handlers/effecthandlers/Relax.java vendored
View File

@@ -59,31 +59,22 @@ public final class Relax extends AbstractEffect
return false;
}
if (info.getEffected().isPlayer())
if (info.getEffected().isPlayer() && !info.getEffected().getActingPlayer().isSitting())
{
if (!info.getEffected().getActingPlayer().isSitting())
{
return false;
}
return false;
}
if ((info.getEffected().getCurrentHp() + 1) > info.getEffected().getMaxRecoverableHp())
if (((info.getEffected().getCurrentHp() + 1) > info.getEffected().getMaxRecoverableHp()) && info.getSkill().isToggle())
{
if (info.getSkill().isToggle())
{
info.getEffected().sendPacket(SystemMessageId.THAT_SKILL_HAS_BEEN_DE_ACTIVATED_AS_HP_WAS_FULLY_RECOVERED);
return false;
}
info.getEffected().sendPacket(SystemMessageId.THAT_SKILL_HAS_BEEN_DE_ACTIVATED_AS_HP_WAS_FULLY_RECOVERED);
return false;
}
final double manaDam = _power * getTicksMultiplier();
if (manaDam > info.getEffected().getCurrentMp())
if ((manaDam > info.getEffected().getCurrentMp()) && info.getSkill().isToggle())
{
if (info.getSkill().isToggle())
{
info.getEffected().sendPacket(SystemMessageId.YOUR_SKILL_WAS_DEACTIVATED_DUE_TO_LACK_OF_MP);
return false;
}
info.getEffected().sendPacket(SystemMessageId.YOUR_SKILL_WAS_DEACTIVATED_DUE_TO_LACK_OF_MP);
return false;
}
info.getEffected().reduceCurrentMp(manaDam);