From 9f856a2b2f9741732ac210d441aa737b605b4757 Mon Sep 17 00:00:00 2001
From: xban1x <urban.lavbic@gmail.com>
Date: Sat, 25 Jan 2014 18:14:31 +0000
Subject: [PATCH] BETA: DP-Part for [L6367].
---
.../dist/game/data/scripts/ai/group_template/GiantsCave.java | 2 +-
.../data/scripts/ai/group_template/PlainsOfLizardman.java | 4 ++--
.../game/data/scripts/ai/group_template/PrimevalIsle.java | 2 +-
.../data/scripts/ai/group_template/SeeThroughSilentMove.java | 4 ++--
.../game/data/scripts/ai/group_template/SelMahumDrill.java | 2 +-
.../data/scripts/ai/group_template/WarriorFishingBlock.java | 2 +-
.../game/data/scripts/handlers/effecthandlers/AddHate.java | 2 +-
.../game/data/scripts/handlers/effecthandlers/Confuse.java | 2 +-
.../game/data/scripts/handlers/effecthandlers/DeleteHate.java | 2 +-
.../data/scripts/handlers/effecthandlers/DeleteHateOfMe.java | 2 +-
.../game/data/scripts/handlers/effecthandlers/Passive.java | 2 +-
.../data/scripts/handlers/effecthandlers/RandomizeHate.java | 4 ++--
.../game/data/scripts/handlers/effecthandlers/Sweeper.java | 2 +-
.../data/scripts/handlers/effecthandlers/TransferHate.java | 2 +-
.../dist/game/data/scripts/handlers/targethandlers/Area.java | 4 ++--
.../data/scripts/handlers/targethandlers/AreaCorpseMob.java | 4 ++--
.../game/data/scripts/handlers/targethandlers/AreaSummon.java | 2 +-
.../dist/game/data/scripts/handlers/targethandlers/Aura.java | 2 +-
.../data/scripts/handlers/targethandlers/AuraCorpseMob.java | 2 +-
.../game/data/scripts/handlers/targethandlers/BehindArea.java | 4 ++--
.../game/data/scripts/handlers/targethandlers/BehindAura.java | 2 +-
.../game/data/scripts/handlers/targethandlers/CorpseMob.java | 2 +-
.../game/data/scripts/handlers/targethandlers/FrontArea.java | 4 ++--
.../game/data/scripts/handlers/targethandlers/FrontAura.java | 2 +-
.../instances/FinalEmperialTomb/FinalEmperialTomb.java | 2 +-
.../game/data/scripts/instances/SeedOfDestruction/Stage1.java | 2 +-
.../Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java | 4 ++--
27 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/GiantsCave.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/GiantsCave.java
index e3b0693358..33d95b777e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/GiantsCave.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/GiantsCave.java
@@ -63,7 +63,7 @@ public final class GiantsCave extends AbstractNpcAI
for (L2Character characters : npc.getKnownList().getKnownCharactersInRadius(450))
{
- if ((characters != null) && (characters.isL2Attackable()) && (getRandomBoolean()))
+ if ((characters != null) && (characters.isAttackable()) && (getRandomBoolean()))
{
L2Attackable monster = (L2Attackable) characters;
attackPlayer(monster, player);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
index 22d96ffcdb..fc71eccf43 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
@@ -102,7 +102,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI
npc.doCast(FANTASY_MUSHROOM_SKILL.getSkill());
for (L2Character target : npc.getKnownList().getKnownCharactersInRadius(200))
{
- if ((target != null) && target.isL2Attackable())
+ if ((target != null) && target.isAttackable())
{
final L2Attackable monster = (L2Attackable) target;
npc.setTarget(monster);
@@ -142,7 +142,7 @@ public final class PlainsOfLizardman extends AbstractNpcAI
npc.setIsInvul(true);
for (L2Character target : npc.getKnownList().getKnownCharactersInRadius(1000))
{
- if ((target != null) && target.isL2Attackable())
+ if ((target != null) && target.isAttackable())
{
final L2Attackable monster = (L2Attackable) target;
if ((monster.getId() == TANTA_MAGICIAN) || (monster.getId() == TANTA_SCOUT))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
index ac7827f963..1528a99750 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
@@ -347,7 +347,7 @@ public final class PrimevalIsle extends AbstractNpcAI
final L2Playable playable = isSummon ? attacker.getSummon() : attacker;
for (L2Character characters : npc.getKnownList().getKnownCharactersInRadius(500))
{
- if ((characters != null) && (characters.isL2Attackable()) && (getRandomBoolean()))
+ if ((characters != null) && (characters.isAttackable()) && (getRandomBoolean()))
{
L2Attackable monster = (L2Attackable) characters;
attackPlayer(monster, playable);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
index d47a9dae89..53a7396c29 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
@@ -50,7 +50,7 @@ public class SeeThroughSilentMove extends AbstractNpcAI
for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId))
{
final L2Npc npc = spawn.getLastSpawn();
- if ((npc != null) && npc.isL2Attackable())
+ if ((npc != null) && npc.isAttackable())
{
((L2Attackable) npc).setSeeThroughSilentMove(true);
}
@@ -62,7 +62,7 @@ public class SeeThroughSilentMove extends AbstractNpcAI
@Override
public String onSpawn(L2Npc npc)
{
- if (npc.isL2Attackable())
+ if (npc.isAttackable())
{
((L2Attackable) npc).setSeeThroughSilentMove(true);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
index 4f508feafa..c3e9c6bbc4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
@@ -253,7 +253,7 @@ public final class SelMahumDrill extends AbstractNpcAI
{
broadcastNpcSay(receiver, Say2.NPC_ALL, SOLDIER_FSTRINGS[getRandom(2)]);
}
- if (receiver.isAttackable())
+ if (receiver.canBeAttacked())
{
((L2Attackable) receiver).clearAggroList();
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
index 808d0da521..eb65be899b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
@@ -109,7 +109,7 @@ public class WarriorFishingBlock extends AbstractNpcAI
@Override
public String onSpawn(L2Npc npc)
{
- if ((npc == null) || !npc.isL2Attackable())
+ if ((npc == null) || !npc.isAttackable())
{
return null;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index a2530b0438..12658811d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -44,7 +44,7 @@ public final class AddHate extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- if (!info.getEffected().isL2Attackable())
+ if (!info.getEffected().isAttackable())
{
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
index aba353c46e..f21c2f97a9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Confuse.java
@@ -83,7 +83,7 @@ public final class Confuse extends AbstractEffect
// Getting the possible targets
for (L2Object obj : info.getEffected().getKnownList().getKnownObjects().values())
{
- if (((info.getEffected().isMonster() && obj.isL2Attackable()) || (obj instanceof L2Character)) && (obj != info.getEffected()))
+ if (((info.getEffected().isMonster() && obj.isAttackable()) || (obj instanceof L2Character)) && (obj != info.getEffected()))
{
targetList.add((L2Character) obj);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
index 2203af33b5..88ff30e097 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java
@@ -62,7 +62,7 @@ public final class DeleteHate extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- if (!info.getEffected().isL2Attackable())
+ if (!info.getEffected().isAttackable())
{
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
index 0341d45edf..be4110db01 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java
@@ -62,7 +62,7 @@ public final class DeleteHateOfMe extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- if (!info.getEffected().isL2Attackable())
+ if (!info.getEffected().isAttackable())
{
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java
index 58a9712959..ab0b43a89d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Passive.java
@@ -45,7 +45,7 @@ public final class Passive extends AbstractEffect
@Override
public boolean canStart(BuffInfo info)
{
- return info.getEffected().isL2Attackable();
+ return info.getEffected().isAttackable();
}
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
index c19e6dcf1c..7de67f7fa4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java
@@ -58,7 +58,7 @@ public final class RandomizeHate extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- if ((info.getEffected() == null) || (info.getEffected() == info.getEffector()) || !info.getEffected().isL2Attackable())
+ if ((info.getEffected() == null) || (info.getEffected() == info.getEffector()) || !info.getEffected().isAttackable())
{
return;
}
@@ -70,7 +70,7 @@ public final class RandomizeHate extends AbstractEffect
if ((cha != null) && (cha != effectedMob) && (cha != info.getEffector()))
{
// Aggro cannot be transfered to a mob of the same faction.
- if (cha.isL2Attackable() && (((L2Attackable) cha).getFactionId() != null) && ((L2Attackable) cha).getFactionId().equals(effectedMob.getFactionId()))
+ if (cha.isAttackable() && (((L2Attackable) cha).getFactionId() != null) && ((L2Attackable) cha).getFactionId().equals(effectedMob.getFactionId()))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java
index f3a8cb08e3..4bd360b769 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java
@@ -48,7 +48,7 @@ public final class Sweeper extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isL2Attackable())
+ if ((info.getEffector() == null) || (info.getEffected() == null) || !info.getEffector().isPlayer() || !info.getEffected().isAttackable())
{
return;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
index 8db0b0e129..66f5f61127 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java
@@ -64,7 +64,7 @@ public final class TransferHate extends AbstractEffect
{
for (L2Character obj : info.getEffector().getKnownList().getKnownCharactersInRadius(info.getSkill().getAffectRange()))
{
- if ((obj == null) || !obj.isL2Attackable() || obj.isDead())
+ if ((obj == null) || !obj.isAttackable() || obj.isDead())
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Area.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Area.java
index e86debe7b6..50b2cad04b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Area.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Area.java
@@ -40,7 +40,7 @@ public class Area implements ITargetTypeHandler
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
List<L2Character> targetList = new ArrayList<>();
- if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isL2Attackable() || target.isPlayable())))
+ if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable())))
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return EMPTY_TARGET_LIST;
@@ -76,7 +76,7 @@ public class Area implements ITargetTypeHandler
final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
for (L2Character obj : objs)
{
- if (!(obj.isL2Attackable() || obj.isPlayable()))
+ if (!(obj.isAttackable() || obj.isPlayable()))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java
index 05d76c0b43..75fde1a4af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java
@@ -39,7 +39,7 @@ public class AreaCorpseMob implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- if ((target == null) || !target.isL2Attackable() || !target.isDead())
+ if ((target == null) || !target.isAttackable() || !target.isDead())
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return EMPTY_TARGET_LIST;
@@ -60,7 +60,7 @@ public class AreaCorpseMob implements ITargetTypeHandler
final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
for (L2Character obj : objs)
{
- if (!(obj.isL2Attackable() || obj.isPlayable()) || !Util.checkIfInRange(skill.getAffectRange(), target, obj, true))
+ if (!(obj.isAttackable() || obj.isPlayable()) || !Util.checkIfInRange(skill.getAffectRange(), target, obj, true))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
index bb879ed53b..823a97dd10 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
@@ -69,7 +69,7 @@ public class AreaSummon implements ITargetTypeHandler
continue;
}
- if (!(obj.isL2Attackable() || obj.isPlayable()))
+ if (!(obj.isAttackable() || obj.isPlayable()))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java
index 45bd83eebd..56fb82d75e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java
@@ -42,7 +42,7 @@ public class Aura implements ITargetTypeHandler
final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange());
for (L2Character obj : objs)
{
- if (obj.isL2Attackable() || obj.isPlayable())
+ if (obj.isAttackable() || obj.isPlayable())
{
if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java
index a31ed4cb30..a4d0c7eee7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/AuraCorpseMob.java
@@ -42,7 +42,7 @@ public class AuraCorpseMob implements ITargetTypeHandler
int maxTargets = skill.getAffectLimit();
for (L2Character obj : objs)
{
- if (obj.isL2Attackable() && obj.isDead())
+ if (obj.isAttackable() && obj.isDead())
{
if (onlyFirst)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindArea.java
index a4b1a14d61..fbdd9988ed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindArea.java
@@ -40,7 +40,7 @@ public class BehindArea implements ITargetTypeHandler
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
List<L2Character> targetList = new ArrayList<>();
- if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isL2Attackable() || target.isPlayable())))
+ if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable())))
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return EMPTY_TARGET_LIST;
@@ -76,7 +76,7 @@ public class BehindArea implements ITargetTypeHandler
int maxTargets = skill.getAffectLimit();
for (L2Character obj : objs)
{
- if (!(obj.isL2Attackable() || obj.isPlayable()))
+ if (!(obj.isAttackable() || obj.isPlayable()))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java
index d944f7438e..6180659475 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java
@@ -43,7 +43,7 @@ public class BehindAura implements ITargetTypeHandler
int maxTargets = skill.getAffectLimit();
for (L2Character obj : objs)
{
- if (obj.isL2Attackable() || obj.isPlayable())
+ if (obj.isAttackable() || obj.isPlayable())
{
if (!obj.isBehind(activeChar))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java
index a560fe398d..9a7f2e00cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/CorpseMob.java
@@ -38,7 +38,7 @@ public class CorpseMob implements ITargetTypeHandler
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
- if ((target == null) || !target.isL2Attackable() || !target.isDead())
+ if ((target == null) || !target.isAttackable() || !target.isDead())
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return EMPTY_TARGET_LIST;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontArea.java
index a22d7c3b26..d0de49ce0c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontArea.java
@@ -40,7 +40,7 @@ public class FrontArea implements ITargetTypeHandler
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
{
List<L2Character> targetList = new ArrayList<>();
- if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isL2Attackable() || target.isPlayable())))
+ if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable())))
{
activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
return EMPTY_TARGET_LIST;
@@ -76,7 +76,7 @@ public class FrontArea implements ITargetTypeHandler
int maxTargets = skill.getAffectLimit();
for (L2Character obj : objs)
{
- if (!(obj.isL2Attackable() || obj.isPlayable()))
+ if (!(obj.isAttackable() || obj.isPlayable()))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java
index 871b78dfd2..20cea8ebcc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java
@@ -43,7 +43,7 @@ public class FrontAura implements ITargetTypeHandler
int maxTargets = skill.getAffectLimit();
for (L2Character obj : objs)
{
- if (obj.isL2Attackable() || obj.isPlayable())
+ if (obj.isAttackable() || obj.isPlayable())
{
if (!obj.isInFrontOf(activeChar))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index ec14eb995f..3c5c97fcf2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -805,7 +805,7 @@ public final class FinalEmperialTomb extends Quest
world.npcList.add(npc);
}
npc.setIsNoRndWalk(true);
- if (npc.isInstanceType(InstanceType.L2Attackable))
+ if (npc.isInstanceTypes(InstanceType.L2Attackable))
{
((L2Attackable) npc).setSeeThroughSilentMove(true);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
index b8cfe4c701..e337fd300a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java
@@ -724,7 +724,7 @@ public final class Stage1 extends Quest
world.npcList.put(npc, false);
}
npc.setIsNoRndWalk(true);
- if (npc.isInstanceType(InstanceType.L2Attackable))
+ if (npc.isInstanceTypes(InstanceType.L2Attackable))
{
((L2Attackable) npc).setSeeThroughSilentMove(true);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index ddc7bcd2a5..089d33abf4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -178,7 +178,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
- if (npc.isL2Attackable() && _npcLevelingInfos.containsKey(npc.getId()))
+ if (npc.isAttackable() && _npcLevelingInfos.containsKey(npc.getId()))
{
levelSoulCrystals((L2Attackable) npc, killer);
}
@@ -199,7 +199,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
{
return null;
}
- if (!npc.isL2Attackable() || npc.isDead() || !_npcLevelingInfos.containsKey(npc.getId()))
+ if (!npc.isAttackable() || npc.isDead() || !_npcLevelingInfos.containsKey(npc.getId()))
{
return null;
}
--
GitLab