From 8209afe63602396582b73b3482be85c72bca7ec2 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 26 Apr 2015 19:47:19 -0300
Subject: [PATCH] Cleanup of invalud methods.
Reported by: valanths1990
---
.../handlers/effecthandlers/TransferHate.java | 11 +++++------
.../scripts/handlers/effecthandlers/Unsummon.java | 8 --------
.../handlers/effecthandlers/VitalityPointUp.java | 13 +++++--------
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
index 0b6b604736..fac4aabe12 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
@@ -48,12 +48,6 @@ public final class TransferHate extends AbstractEffect
return Formulas.calcProbability(_chance, info.getEffector(), info.getEffected(), info.getSkill());
}
- @Override
- public boolean canStart(BuffInfo info)
- {
- return Util.checkIfInRange(info.getSkill().getEffectRange(), info.getEffector(), info.getEffected(), true);
- }
-
@Override
public boolean isInstant()
{
@@ -63,6 +57,11 @@ public final class TransferHate extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
+ if (!Util.checkIfInRange(info.getSkill().getEffectRange(), info.getEffector(), info.getEffected(), true))
+ {
+ return;
+ }
+
for (L2Character obj : info.getEffector().getKnownList().getKnownCharactersInRadius(info.getSkill().getAffectRange()))
{
if ((obj == null) || !obj.isAttackable() || obj.isDead())
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
index 67a2201270..5cec234a03 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java
@@ -55,16 +55,9 @@ public final class Unsummon extends AbstractEffect
return true;
}
}
-
return false;
}
- @Override
- public boolean canStart(BuffInfo info)
- {
- return info.getEffected().isSummon();
- }
-
@Override
public boolean isInstant()
{
@@ -75,7 +68,6 @@ public final class Unsummon extends AbstractEffect
public void onStart(BuffInfo info)
{
final L2Summon summon = info.getEffected().getSummon();
-
if (summon != null)
{
final L2PcInstance summonOwner = summon.getOwner();
diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
index b0fee23266..7ea317f24d 100644
--- a/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
+++ b/L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
@@ -39,12 +39,6 @@ public final class VitalityPointUp extends AbstractEffect
_value = params.getFloat("value", 0);
}
- @Override
- public boolean canStart(BuffInfo info)
- {
- return (info.getEffected() != null) && info.getEffected().isPlayer();
- }
-
@Override
public boolean isInstant()
{
@@ -54,7 +48,10 @@ public final class VitalityPointUp extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- info.getEffected().getActingPlayer().updateVitalityPoints(_value, false, false);
- info.getEffected().getActingPlayer().sendPacket(new UserInfo(info.getEffected().getActingPlayer()));
+ if ((info.getEffected() != null) && info.getEffected().isPlayer())
+ {
+ info.getEffected().getActingPlayer().updateVitalityPoints(_value, false, false);
+ info.getEffected().getActingPlayer().sendPacket(new UserInfo(info.getEffected().getActingPlayer()));
+ }
}
}
--
GitLab