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 e3b0693358741cd38e041ecf47ba0cade52ac986..33d95b777e6d3f9c63c4ac44a3aab3305d882c72 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 22d96ffcdb4d4393000484d8e849fac919780354..fc71eccf431c8d471fbe01e258a58b2c25bb81d4 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 ac7827f9632c2cac884c8c3c673f992c5092fc38..1528a99750a33389792f71a8d7a968454666cc21 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 d47a9dae891549a8bfccad55d441b326c17d9e46..53a7396c29c643d5742702279562faa868b95ef0 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 4f508feafa42259b7b407dbcbdd464bedeb5c51d..c3e9c6bbc40420e08d440dc0afcf32282e88214d 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 808d0da52185438116b3226765c9ec82d8967060..eb65be899b7d5633cb08c47eea9ebc6b6ab3ad91 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 a2530b04381d0e20f24f817e78ea5b66d715531c..12658811d90862bd67659a70b925c03093b5d384 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 aba353c46e535f16af8ecd047b5b2e18db68a84d..f21c2f97a98469a639bea7f1aef997ee35c9e6df 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 2203af33b54267423deeab4e47800d060ed0e3ae..88ff30e097355030ffc7b59b1a66d8fe3edf8dfb 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 0341d45edf260016326e6dea1b3df8e4d6d52441..be4110db01326474a9a789bf1a8b9f4df778565d 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 58a9712959085783082da98544a91c89b57d62c7..ab0b43a89dbfc0cc3b3968678582476d48ecd480 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 c19e6dcf1c7b47c3bf54831a11937c544a88c8ba..7de67f7fa45d79c020291afb73ace9cbb5724abe 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 f3a8cb08e3bffeef1b43b42f2008a27a2abd88a0..4bd360b76910d5122310b44e09e9379fb5dbd2c9 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 8db0b0e1299e4c0923a503c9e81042ea0955c2fa..66f5f611275feec86f9a476825b93b4b87236bb3 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 e86debe7b6b1cdf7ae583d2bd0907fa3d9ba765c..50b2cad04b0995fe072f44b25e8aee2175b9a82f 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 05d76c0b43caf43f2eae05473c27f100c6d020e6..75fde1a4af980f3d201f627fd9e88fd1e4a08ffb 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 bb879ed53b6a43c3d355487885626e347080607c..823a97dd10e38c418fe9d78674934a345d2bd3a1 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 45bd83eebdbdb13fa01f11415a4c0bc134f12f3c..56fb82d75ec1dbe79ffae1d039e5cd43f9886db0 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 a31ed4cb30ae78f3dbfac75bde26959ba940dde8..a4d0c7eee7eefb8e89bf0247aed2cea927305faf 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 a4b1a14d618e9a7165ccf3befd8ca501446b1c55..fbdd9988ed53a965e7453d663d098c056b83ad33 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 d944f7438eeeaa1ff16b8c2e0f935e225a390f8d..6180659475d0f964a3967fcd3c6176bcefdcc0c1 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 a560fe398d7debfdff90edd8dad13c25690a7567..9a7f2e00cd39173fbfc2f93a1d351a3ab99c1898 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 a22d7c3b26f62cacbab02764091b38eb02957811..d0de49ce0c25bdb86edbcd56ee6b1cdf9af8ec42 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 871b78dfd2a4490d1a062554170debe7c4874f26..20cea8ebcc6dd23709f045dd15f04b6bf26a72d7 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 ec14eb995fcd846d3917c0ed68f05fec59589e26..3c5c97fcf2797b01113ea04249b31266925656f6 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 b8cfe4c701d034f0140754a7b9cdd722686c57bc..e337fd300a67a941334eb9f04555a01e146a92f3 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 ddc7bcd2a5d92a0b4e1598d348c20c7f0befee72..089d33abf4f973a776cdcbd13daf5b670934718e 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;
}