From bd285c136874a1721b972acde401b48870d667d1 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 2 Jul 2018 01:32:38 +0000 Subject: [PATCH] Replaced instanceof L2MonsterInstance with isMonster method. --- .../ai/bosses/Kimerian/KimerianCommon.java | 3 +-- .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ .../ai/bosses/Kimerian/KimerianCommon.java | 3 +-- .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ .../ai/bosses/Kimerian/KimerianCommon.java | 3 +-- .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ .../ai/bosses/Kimerian/KimerianCommon.java | 3 +-- .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ .../Q00144_PailakaInjuredDragon.java | 2 +- .../l2jmobius/gameserver/ai/L2AttackableAI.java | 6 +++--- .../gameserver/model/actor/L2Attackable.java | 2 +- .../model/conditions/ConditionTargetAggro.java | 2 +- .../network/serverpackets/AbstractNpcInfo.java | 3 +-- .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ .../model/conditions/ConditionTargetAggro.java | 15 +++++++++------ 16 files changed, 74 insertions(+), 58 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index ff290b7fab..9dc3e8227c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; @@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) { final L2Character monster = (L2Character) player.getTarget(); - if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) + if ((monster != null) && monster.isMonster() && player.isInCombat()) { addAttackDesire(npc, monster); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index ff290b7fab..9dc3e8227c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; @@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) { final L2Character monster = (L2Character) player.getTarget(); - if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) + if ((monster != null) && monster.isMonster() && player.isInCombat()) { addAttackDesire(npc, monster); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index ff290b7fab..9dc3e8227c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; @@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) { final L2Character monster = (L2Character) player.getTarget(); - if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) + if ((monster != null) && monster.isMonster() && player.isInCombat()) { addAttackDesire(npc, monster); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java index ff290b7fab..9dc3e8227c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java @@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Attackable; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDeath; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee; @@ -109,7 +108,7 @@ public final class KimerianCommon extends AbstractInstance else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null)) { final L2Character monster = (L2Character) player.getTarget(); - if ((monster != null) && (monster instanceof L2MonsterInstance) && player.isInCombat()) + if ((monster != null) && monster.isMonster() && player.isInCombat()) { addAttackDesire(npc, monster); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 8dd1040079..86c6931b3b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -848,7 +848,7 @@ public class Q00144_PailakaInjuredDragon extends Quest @Override public String onSpawn(L2Npc npc) { - if (npc instanceof L2MonsterInstance) + if (npc.isMonster()) { for (int mobId : WALL_MONSTERS) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 9839082201..6225ba01cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -246,7 +246,7 @@ public class L2AttackableAI extends L2CharacterAI return GeoEngine.getInstance().canSeeTarget(me, player); // Los Check } // Check if the L2MonsterInstance target is aggressive - if ((target instanceof L2MonsterInstance) && Config.GUARD_ATTACK_AGGRO_MOB) + if (target.isMonster() && Config.GUARD_ATTACK_AGGRO_MOB) { return (((L2MonsterInstance) target).isAggressive() && GeoEngine.getInstance().canSeeTarget(me, target)); } @@ -2336,7 +2336,7 @@ public class L2AttackableAI extends L2CharacterAI setIntention(AI_INTENTION_ATTACK, attacker); } - if (me instanceof L2MonsterInstance) + if (me.isMonster()) { L2MonsterInstance master = (L2MonsterInstance) me; @@ -2388,7 +2388,7 @@ public class L2AttackableAI extends L2CharacterAI setIntention(AI_INTENTION_ATTACK, target); } - if (me instanceof L2MonsterInstance) + if (me.isMonster()) { L2MonsterInstance master = (L2MonsterInstance) me; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 363ca3b7cb..adf110d6ea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -269,7 +269,7 @@ public class L2Attackable extends L2Npc } // If this L2Attackable is a L2MonsterInstance and it has spawned minions, call its minions to battle - if (this instanceof L2MonsterInstance) + if (isMonster()) { L2MonsterInstance master = (L2MonsterInstance) this; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 332c576e86..aaaf43d498 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -44,7 +44,7 @@ public class ConditionTargetAggro extends Condition { if (effected != null) { - if (effected instanceof L2MonsterInstance) + if (effected.isMonster()) { return ((L2MonsterInstance) effected).isAggressive() == _isAggro; } 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 d2a18e3679..5fa046e804 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 @@ -25,7 +25,6 @@ import com.l2jmobius.gameserver.model.PcCondOverride; 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.L2TrapInstance; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -113,7 +112,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _title = cha.getTitle(); // On every subclass } - if (Config.SHOW_NPC_LVL && (_npc instanceof L2MonsterInstance)) + if (Config.SHOW_NPC_LVL && _npc.isMonster()) { String t = "Lv " + cha.getLevel() + (cha.isAggressive() ? "*" : ""); if (_title != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 763ff467af..15382962fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -42,13 +42,16 @@ public class ConditionTargetAggro extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effected instanceof L2MonsterInstance) + if (effected != null) { - return ((L2MonsterInstance) effected).isAggressive() == _isAggro; - } - if (effected.isPlayer()) - { - return ((L2PcInstance) effected).getReputation() < 0; + if (effected.isMonster()) + { + return ((L2MonsterInstance) effected).isAggressive() == _isAggro; + } + if (effected.isPlayer()) + { + return ((L2PcInstance) effected).getReputation() < 0; + } } return false; }