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

Fixed sending self damage message.

Browse Source
This commit is contained in:
MobiusDev
2019-01-14 05:44:23 +00:00
parent dafe02deda
commit ae59dda434
12 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -11660,7 +11660,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage);
}
final SystemMessage sm;
SystemMessage sm = null;
if ((target.isHpBlocked() && !target.isNpc()) || (target.isPlayer() && target.isAffected(EffectFlag.DUELIST_FURY) && !isAffected(EffectFlag.FACEOFF)))
{
@ -11671,7 +11671,7 @@ public final class L2PcInstance extends L2Playable
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage);
}
else
else if (this != target)
{
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this);
@ -11679,7 +11679,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage);
}
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
}
/**