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

Proper message when source is different than target in some effect handlers.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDev
2018-05-06 20:59:01 +00:00
parent 216b93813b
commit 159bf75e2f
16 changed files with 212 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -70,8 +70,19 @@ public final class CpHeal extends AbstractEffect
target.setCurrentCp(amount + target.getCurrentCp()); target.setCurrentCp(amount + target.getCurrentCp());
} }
final L2Character caster = info.getEffector();
if ((caster != null) && (caster != target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(caster.getName());
sm.addInt((int) amount);
target.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
target.sendPacket(sm); target.sendPacket(sm);
} }
}
} }

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -66,8 +66,19 @@ public final class CpHealPercent extends AbstractEffect
target.setCurrentCp(amount + target.getCurrentCp()); target.setCurrentCp(amount + target.getCurrentCp());
} }
final L2Character caster = info.getEffector();
if ((caster != null) && (caster != target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(caster.getName());
sm.addInt((int) amount);
target.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
target.sendPacket(sm); target.sendPacket(sm);
} }
}
} }

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java vendored
View File

@@ -98,12 +98,23 @@ public final class MaxCp extends AbstractEffect
} }
} }
if (_heal) if (_heal)
{
final L2Character caster = info.getEffector();
if ((caster != null) && (caster != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(caster.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
} }
}
@Override @Override
public void onExit(BuffInfo info) public void onExit(BuffInfo info)

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java vendored
View File

@@ -99,12 +99,23 @@ public final class MaxHp extends AbstractEffect
} }
} }
if (_heal) if (_heal)
{
final L2Character caster = info.getEffector();
if ((caster != null) && (caster != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(caster.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
} }
}
@Override @Override
public void onExit(BuffInfo info) public void onExit(BuffInfo info)

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java vendored
View File

@@ -69,8 +69,18 @@ public final class CpHeal extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }

10
L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java vendored
View File

@@ -65,8 +65,18 @@ public final class CpHealPercent extends AbstractEffect
effected.broadcastStatusUpdate(effector); effected.broadcastStatusUpdate(effector);
} }
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}
else
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED);
sm.addInt((int) amount); sm.addInt((int) amount);
effected.sendPacket(sm); effected.sendPacket(sm);
} }
}
} }