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
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11653,7 +11653,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11672,7 +11672,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11660,7 +11660,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11679,7 +11679,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11670,7 +11670,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11689,7 +11689,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11654,7 +11654,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11673,7 +11673,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11660,7 +11660,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11679,7 +11679,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11660,7 +11660,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11679,7 +11679,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+6 -3
View File
@@ -16792,9 +16792,12 @@ public final class L2PcInstance extends L2Playable
Olympiad.getInstance().notifyCompetitorDamage(this, damage, getOlympiadGameId()); Olympiad.getInstance().notifyCompetitorDamage(this, damage, getOlympiadGameId());
} }
SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DID_S1_DMG); if (this != target)
sm.addNumber(damage); {
sendPacket(sm); SystemMessage sm = new SystemMessage(SystemMessageId.YOU_DID_S1_DMG);
sm.addNumber(damage);
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -12543,7 +12543,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage);
} }
final SystemMessage sm; SystemMessage sm = null;
if (target.isInvul() && !target.isNpc()) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DONE_S3_POINTS_OF_DAMAGE_TO_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DONE_S3_POINTS_OF_DAMAGE_TO_C2);
sm.addPcName(this); sm.addPcName(this);
sm.addString(target.getName()); sm.addString(target.getName());
sm.addInt(damage); sm.addInt(damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11494,7 +11494,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11513,7 +11513,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11501,7 +11501,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11520,7 +11520,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11503,7 +11503,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11522,7 +11522,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+7 -3
View File
@@ -11503,7 +11503,7 @@ public final class L2PcInstance extends L2Playable
OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage); 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))) 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 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HIT_FOR_S1_DAMAGE);
sm.addInt(damage); sm.addInt(damage);
} }
else else if (this != target)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2); sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2);
sm.addPcName(this); sm.addPcName(this);
@@ -11522,7 +11522,11 @@ public final class L2PcInstance extends L2Playable
sm.addInt(damage); sm.addInt(damage);
sm.addPopup(target.getObjectId(), getObjectId(), -damage); sm.addPopup(target.getObjectId(), getObjectId(), -damage);
} }
sendPacket(sm);
if (sm != null)
{
sendPacket(sm);
}
} }
/** /**