diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 2c1962dca9..e574cf6734 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -743,7 +743,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -755,7 +755,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 8259974b41..d86edbd245 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -743,7 +743,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -755,7 +755,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 8259974b41..d86edbd245 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -743,7 +743,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -755,7 +755,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 8259974b41..d86edbd245 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -743,7 +743,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -755,7 +755,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 7e65ade406..8d2d2c0082 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -739,7 +739,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -751,7 +751,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java index e7664b6189..ba6c98e9f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java @@ -21,7 +21,6 @@ import java.util.StringTokenizer; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.L2Object; -import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.instancezone.Instance; import com.l2jmobius.gameserver.model.instancezone.InstanceWorld; @@ -108,7 +107,7 @@ public class AdminInstance implements IAdminCommandHandler } final L2Object target = activeChar.getTarget(); - if ((target == null) || (target instanceof L2Summon)) // Don't separate summons from masters + if ((target == null) || target.isSummon()) // Don't separate summons from masters { BuilderUtil.sendSysMessage(activeChar, "Incorrect target."); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java index f37d4e3b27..28f7201469 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -95,7 +95,7 @@ public abstract class AbstractAI implements Ctrl final L2Character followTarget = _followTarget; // copy to prevent NPE if (followTarget == null) { - if (_actor instanceof L2Summon) + if (_actor.isSummon()) { ((L2Summon) _actor).setFollowStatus(false); } @@ -108,7 +108,7 @@ public abstract class AbstractAI implements Ctrl if (!_actor.isInsideRadius(followTarget, 3000, true, false)) { // if the target is too far (maybe also teleported) - if (_actor instanceof L2Summon) + if (_actor.isSummon()) { ((L2Summon) _actor).setFollowStatus(false); } @@ -713,7 +713,7 @@ public abstract class AbstractAI implements Ctrl public void setAutoAttacking(boolean isAutoAttacking) { - if (_actor instanceof L2Summon) + if (_actor.isSummon()) { final L2Summon summon = (L2Summon) _actor; if (summon.getOwner() != null) @@ -731,7 +731,7 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - if (_actor instanceof L2Summon) + if (_actor.isSummon()) { final L2Summon summon = (L2Summon) _actor; if (summon.getOwner() != null) @@ -759,7 +759,7 @@ public abstract class AbstractAI implements Ctrl */ public void clientStopAutoAttack() { - if (_actor instanceof L2Summon) + if (_actor.isSummon()) { final L2Summon summon = (L2Summon) _actor; if (summon.getOwner() != null) 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 479d325e8a..9839082201 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 @@ -1938,7 +1938,7 @@ public class L2AttackableAI extends L2CharacterAI continue; } - if ((obj.isPlayer() || (obj instanceof L2Summon)) && (dist2 <= range) && !getAttackTarget().isAffectedBySkill(sk.getId())) + if ((obj.isPlayer() || obj.isSummon()) && (dist2 <= range) && !getAttackTarget().isAffectedBySkill(sk.getId())) { return obj; } @@ -2010,7 +2010,7 @@ public class L2AttackableAI extends L2CharacterAI continue; } - if ((obj.isPlayer() || (obj instanceof L2Summon)) && (dist2 <= range) && (getAttackTarget().getEffectList().getFirstEffect(L2EffectType.BUFF) != null)) + if ((obj.isPlayer() || obj.isSummon()) && (dist2 <= range) && (getAttackTarget().getEffectList().getFirstEffect(L2EffectType.BUFF) != null)) { return obj; } @@ -2087,7 +2087,7 @@ public class L2AttackableAI extends L2CharacterAI } continue; } - if (obj instanceof L2Summon) + if (obj.isSummon()) { return obj; } @@ -2162,7 +2162,7 @@ public class L2AttackableAI extends L2CharacterAI setAttackTarget(obj); } } - else if (obj instanceof L2Summon) + else if (obj.isSummon()) { actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); actor.setTarget(obj); @@ -2235,7 +2235,7 @@ public class L2AttackableAI extends L2CharacterAI setAttackTarget(obj); } } - else if (obj instanceof L2Summon) + else if (obj.isSummon()) { actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); actor.setTarget(obj); 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 963e95bffa..f022d0777f 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 @@ -136,7 +136,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable { player = (L2PcInstance) target; } - else if (target instanceof L2Summon) + else if (target.isSummon()) { player = ((L2Summon) target).getOwner(); } @@ -151,7 +151,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable } // Get the owner if the target is a summon - if (target instanceof L2Summon) + if (target.isSummon()) { final L2PcInstance owner = ((L2Summon) target).getOwner(); if (_actor.isInsideRadius(owner, 1000, true, false)) 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 f8e4fd23ca..5f42aef77c 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 @@ -136,7 +136,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable } // Get the owner if the target is a summon - if (target instanceof L2Summon) + if (target.isSummon()) { final L2PcInstance owner = ((L2Summon) target).getOwner(); if (_actor.isInsideRadius(owner, 1000, true, false)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 96ca5907f1..5217d1b686 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -135,7 +135,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance } case 2: { - if (attacker instanceof L2Summon) + if (attacker.isSummon()) { attacker = ((L2Summon) attacker).getOwner(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java index ae4869c11f..d3aeec4c44 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java @@ -73,7 +73,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance { player = (L2PcInstance) killer; } - else if (killer instanceof L2Summon) + else if (killer.isSummon()) { player = ((L2Summon) killer).getOwner(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 8889090248..817d1574c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -13801,7 +13801,7 @@ public final class L2PcInstance extends L2Playable } L2PcInstance target; - if (cha instanceof L2Summon) + if (cha.isSummon()) { target = ((L2Summon) cha).getOwner(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java index a7ce8a85fe..5798ec8f97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.PcCondOverride; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; -import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.conditions.Condition; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.holders.SkillHolder; @@ -829,7 +828,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable if (!preCondition.test(activeChar, target, null, null)) { - if (activeChar instanceof L2Summon) + if (activeChar.isSummon()) { activeChar.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 02bb140a2f..458f911e44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -739,7 +739,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -751,7 +751,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 02bb140a2f..458f911e44 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -739,7 +739,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -751,7 +751,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 6c381c9cda..381ebb85ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -739,7 +739,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_info")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { gatherSummonInfo((L2Summon) target, activeChar); } @@ -751,7 +751,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_unsummon")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Summon) + if ((target != null) && target.isSummon()) { ((L2Summon) target).unSummon(((L2Summon) target).getOwner()); }