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

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java vendored
View File

@ -74,7 +74,7 @@ public final class HpCpHeal extends AbstractEffect
final boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
final boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
if (((sps || bss) && (activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass())) || activeChar.isSummon())
if (((sps || bss) && activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass()) || activeChar.isSummon())
{
staticShotBonus = info.getSkill().getMpConsume(); // static bonus for spiritshots
mAtkMul = bss ? 4 : 2;
@ -151,19 +151,18 @@ public final class HpCpHeal extends AbstractEffect
{
target.setCurrentCp(amount + target.getCurrentCp());
final SystemMessage sm;
if (activeChar.isPlayer() && (activeChar != target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(activeChar.getName());
sm.addInt((int) amount);
target.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount);
target.sendPacket(sm);
sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
}
sm.addInt((int) amount);
target.sendPacket(sm);
}
}
}