From ae59dda43454eead2aafd883c46f79d3c823f506 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 14 Jan 2019 05:44:23 +0000 Subject: [PATCH] Fixed sending self damage message. --- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 9 ++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- .../gameserver/model/actor/instance/L2PcInstance.java | 10 +++++++--- 12 files changed, 83 insertions(+), 36 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index c6ae0b8391..5b0ae60c86 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11653,7 +11653,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))) { @@ -11664,7 +11664,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); @@ -11672,7 +11672,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index b36e81c93e..3a47223b7b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -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); + } } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 7972b79486..de2266dd61 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11670,7 +11670,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))) { @@ -11681,7 +11681,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); @@ -11689,7 +11689,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index fc9adf01e8..3f8937c03d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11654,7 +11654,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))) { @@ -11665,7 +11665,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); @@ -11673,7 +11673,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 183e951d26..34c25b8225 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -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); + } } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 30bc4d5ac8..0dc5948d44 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -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); + } } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 3aa8684d4a..30714a5fac 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -16792,9 +16792,12 @@ public final class L2PcInstance extends L2Playable Olympiad.getInstance().notifyCompetitorDamage(this, damage, getOlympiadGameId()); } - SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DID_S1_DMG); - sm.addNumber(damage); - sendPacket(sm); + if (this != target) + { + SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DID_S1_DMG); + sm.addNumber(damage); + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 85bc70f8d9..72cc35759b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -12543,7 +12543,7 @@ public final class L2PcInstance extends L2Playable OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); } - final SystemMessage sm; + SystemMessage sm = null; if (target.isInvul() && !target.isNpc()) { @@ -12554,14 +12554,18 @@ 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_DONE_S3_POINTS_OF_DAMAGE_TO_C2); sm.addPcName(this); sm.addString(target.getName()); sm.addInt(damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 2e20e209ec..3f8c8774c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11494,7 +11494,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))) { @@ -11505,7 +11505,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); @@ -11513,7 +11513,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 746b7ea4ca..7e3e254bad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11501,7 +11501,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))) { @@ -11512,7 +11512,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); @@ -11520,7 +11520,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 0a16b9171c..a1e4682242 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11503,7 +11503,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))) { @@ -11514,7 +11514,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); @@ -11522,7 +11522,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 2068bee8c2..37b3a35aa3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11503,7 +11503,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))) { @@ -11514,7 +11514,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); @@ -11522,7 +11522,11 @@ public final class L2PcInstance extends L2Playable sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage); } - sendPacket(sm); + + if (sm != null) + { + sendPacket(sm); + } } /**