From 5f62a4c74095200661ad14b1efe606741ef866c8 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 2 Jul 2018 01:27:50 +0000 Subject: [PATCH] Replaced instanceof L2NpcInstance with isNpc method. --- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../com/l2jmobius/gameserver/ai/L2ControllableMobAI.java | 3 +-- .../com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java | 3 +-- .../java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java | 3 +-- .../com/l2jmobius/gameserver/model/actor/L2Summon.java | 3 +-- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 7 +------ .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../gameserver/network/serverpackets/AbstractNpcInfo.java | 3 +-- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- .../data/scripts/handlers/bypasshandlers/SkillList.java | 2 +- .../gameserver/model/actor/instance/L2TrapInstance.java | 2 +- .../network/clientpackets/RequestAcquireSkill.java | 8 +------- .../network/clientpackets/RequestAcquireSkillInfo.java | 8 +------- 37 files changed, 37 insertions(+), 137 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index c5e512b380..0307494de4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 9990a21411..e35c04ab14 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 9990a21411..e35c04ab14 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 9990a21411..e35c04ab14 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 373fbea720..6804e215c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -40,7 +40,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index aeb86f4f82..c756097492 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.instance.L2ControllableMobInstance; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -372,7 +371,7 @@ public final class L2ControllableMobAI extends L2AttackableAI private boolean checkAutoAttackCondition(L2Character target) { - if ((target == null) || (target instanceof L2NpcInstance) || (target instanceof L2DoorInstance)) + if ((target == null) || target.isNpc() || (target instanceof L2DoorInstance)) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index f022d0777f..a5436a242d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -37,7 +37,6 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -129,7 +128,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable } // Check if the target isn't another guard, folk or a door - if ((target instanceof L2DefenderInstance) || (target instanceof L2NpcInstance) || (target instanceof L2DoorInstance) || target.isAlikeDead() || (target instanceof L2FortCommanderInstance) || target.isPlayable()) + if ((target instanceof L2DefenderInstance) || target.isNpc() || (target instanceof L2DoorInstance) || target.isAlikeDead() || (target instanceof L2FortCommanderInstance) || target.isPlayable()) { L2PcInstance player = null; if (target.isPlayer()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 5f42aef77c..bd4e590abc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2DefenderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -124,7 +123,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable protected boolean autoAttackCondition(L2Character target) { // Check if the target isn't another guard, folk or a door - if ((target == null) || (target instanceof L2DefenderInstance) || (target instanceof L2NpcInstance) || (target instanceof L2DoorInstance) || target.isAlikeDead()) + if ((target == null) || (target instanceof L2DefenderInstance) || target.isNpc() || (target instanceof L2DoorInstance) || target.isAlikeDead()) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 693058e2e8..4ed33b2f29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -38,7 +38,6 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Party; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.stat.SummonStat; import com.l2jmobius.gameserver.model.actor.status.SummonStatus; @@ -779,7 +778,7 @@ public abstract class L2Summon extends L2Playable final SystemMessage sm; - if (target.isInvul() && !(target instanceof L2NpcInstance)) + if (target.isInvul() && !target.isNpc()) { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index 09acb0ba0a..b371395afb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -325,7 +325,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isInvul() && !(target instanceof L2NpcInstance)) + if (target.isInvul() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 5875a93ab1..44cabfa596 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -101,12 +101,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance)) - { - return; - } - - if (!trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM())) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 075ab83f27..acc2f8aae4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -64,12 +63,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance)) - { - return; - } - - if (!trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM())) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java index f54bbe749b..d2a18e3679 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java @@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -126,7 +125,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket } // npc crest of owning clan/ally of castle - if ((cha instanceof L2NpcInstance) && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0)) + if (cha.isNpc() && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0)) { final L2TownZone town = TownManager.getTown(_x, _y, _z); if (town != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f8258f7f20..7b4a6c54b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f8258f7f20..7b4a6c54b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 296416aea1..a977565e10 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -32,7 +32,7 @@ public class SkillList implements IBypassHandler @Override public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) { - if (!(target instanceof L2NpcInstance)) + if ((target == null) || !target.isNpc()) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index a5d33bbdd1..aba8b753af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -265,7 +265,7 @@ public final class L2TrapInstance extends L2Npc OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage); } - if (target.isHpBlocked() && !(target instanceof L2NpcInstance)) + if (target.isHpBlocked() && !target.isNpc()) { _owner.sendPacket(SystemMessageId.THE_ATTACK_HAS_BEEN_BLOCKED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f8258f7f20..7b4a6c54b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -32,7 +32,6 @@ import com.l2jmobius.gameserver.model.L2Clan; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2FishermanInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2VillageMasterInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; @@ -111,12 +110,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 4feb5ae11d..65bf6539c6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.ClanPrivilege; import com.l2jmobius.gameserver.model.L2SkillLearn; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.base.AcquireSkillType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -67,12 +66,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket } final L2Npc trainer = activeChar.getLastFolkNPC(); - if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) - { - return; - } - - if ((_skillType != AcquireSkillType.CLASS) && !trainer.canInteract(activeChar) && !activeChar.isGM()) + if ((_skillType != AcquireSkillType.CLASS) && ((trainer == null) || !trainer.isNpc() || (!trainer.canInteract(activeChar) && !activeChar.isGM()))) { return; }