diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index eed738e70c..4aa81f0380 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4676,7 +4676,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java index 5089b53c7f..81e04748a4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -800,7 +800,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0ecb1ba4e3..fa2f7c4073 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index cc7cba5458..e4f1b281f3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4682,7 +4682,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java index 5089b53c7f..81e04748a4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -800,7 +800,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0ecb1ba4e3..fa2f7c4073 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 26b83a3a41..218eef5ca2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4684,7 +4684,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java index 5089b53c7f..81e04748a4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -800,7 +800,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0ecb1ba4e3..fa2f7c4073 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index aafe0c77ea..682db56e24 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4682,7 +4682,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java index 39d07bf161..914b15c55c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -800,7 +800,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 0ecb1ba4e3..fa2f7c4073 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg deleted file mode 100644 index d55d5ae3a1..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg +++ /dev/null @@ -1,9 +0,0 @@ -#Olympiad Properties -#Sat Jun 23 03:04:27 EEST 2018 -CurrentCycle=1 -NextWeeklyChange_DateFormat=30 \u0399\u03BF\u03C5\u03BD 2018 2\:40\:38 \u03C0\u03BC -NextWeeklyChange=1530315638161 -OlympiadEnd=1530435600161 -OlympiadEnd_DateFormat=1 \u0399\u03BF\u03C5\u03BB 2018 12\:00\:00 \u03BC\u03BC -Period=0 -ValdationEnd=0 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index 5390604667..63df77002d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -485,7 +485,7 @@ public class Baium extends Quest { for (L2Object obj : objs) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { if (((((L2Character) obj).getZ() < (npc.getZ() - 100)) && (((L2Character) obj).getZ() > (npc.getZ() + 100))) || !GeoData.getInstance().canSeeTarget(obj, npc)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java index f4069e79d0..eba6b82d48 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -572,7 +572,7 @@ abstract class AbstractAI implements Ctrl } // Send a Server->Client packet MoveToPawn/CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers - if (pawn instanceof L2Character) + if (pawn.isCharacter()) { if (_actor.isOnGeodataPath()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 281630c435..6e69c680dd 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -427,7 +427,7 @@ public class L2AttackableAI extends L2CharacterAI // Go through visible objects for (L2Object obj : npc.getKnownList().getKnownObjects().values()) { - if ((obj == null) || !(obj instanceof L2Character)) + if ((obj == null) || !obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index b34d728bae..87665b8edb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -1029,7 +1029,7 @@ public class L2CharacterAI extends AbstractAI offset += _actor.getTemplate().collisionRadius; - if (target instanceof L2Character) + if (target.isCharacter()) { offset += ((L2Character) target).getTemplate().collisionRadius; } @@ -1086,7 +1086,7 @@ public class L2CharacterAI extends AbstractAI stopFollow(); - if ((target instanceof L2Character) && !(target instanceof L2DoorInstance)) + if (target.isCharacter() && !(target instanceof L2DoorInstance)) { if (((L2Character) target).isMoving()) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java index acd330d945..3f7e8dfc95 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java @@ -440,7 +440,7 @@ public class L2ControllableMobAI extends L2AttackableAI for (L2Object obj : npc.getKnownList().getKnownObjects().values()) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java index 08231de013..b80ec6d742 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java @@ -239,7 +239,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -267,7 +267,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.stopAbnormalEffect((short) 0x0400); @@ -322,7 +322,7 @@ public class AdminEffects implements IAdminCommandHandler L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.startAbnormalEffect(0x2000); @@ -340,7 +340,7 @@ public class AdminEffects implements IAdminCommandHandler L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.stopAbnormalEffect((short) 0x2000); @@ -545,7 +545,7 @@ public class AdminEffects implements IAdminCommandHandler L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.stopAllEffects(); @@ -662,7 +662,7 @@ public class AdminEffects implements IAdminCommandHandler obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); } @@ -696,7 +696,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormal(int action, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { L2Character character = (L2Character) target; @@ -718,7 +718,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - if (target instanceof L2Character) + if (target.isCharacter()) { if ((target instanceof L2Summon) || (target instanceof L2ChestInstance)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java index 3e58e17511..ac59901aa3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java @@ -95,7 +95,7 @@ public class AdminHeal implements IAdminCommandHandler final int radius = Integer.parseInt(player); for (L2Object object : activeChar.getKnownList().getKnownObjects().values()) { - if (object instanceof L2Character) + if (object.isCharacter()) { L2Character character = (L2Character) object; character.setCurrentHpMp(character.getMaxHp(), character.getMaxMp()); @@ -121,7 +121,7 @@ public class AdminHeal implements IAdminCommandHandler obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java index d6de2b6491..fb12bfbd40 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java @@ -123,7 +123,7 @@ public class AdminKill implements IAdminCommandHandler { L2Object obj = activeChar.getTarget(); - if ((obj == null) || (obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj == null) || (obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java index adc1e0ef85..f7c71adb45 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java @@ -105,7 +105,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java index d6cd253bfd..eaeae9491d 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java @@ -107,7 +107,7 @@ public class AdminPolymorph implements IAdminCommandHandler obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { L2Character Char = (L2Character) obj; MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java index 19200c4c2f..1fb17fa4ad 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java @@ -196,7 +196,7 @@ public class AdminTest implements IAdminCommandHandler L2Character player; L2Object target = activeChar.getTarget(); - if ((target == null) || !(target instanceof L2Character)) + if ((target == null) || !target.isCharacter()) { player = activeChar; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java index 41e91afc8e..3b5fd4b32b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java @@ -53,7 +53,7 @@ public class CombatPointHeal implements ISkillHandler for (L2Object object : targets) { - if (!(object instanceof L2Character)) + if (!object.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Disablers.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Disablers.java index 9826c826a9..6670ab3b01 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Disablers.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Disablers.java @@ -95,7 +95,7 @@ public class Disablers implements ISkillHandler for (L2Object target2 : targets) { // Get a target - if (!(target2 instanceof L2Character)) + if (!target2.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Recall.java index 3c978e41ec..5bfb022020 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Recall.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Recall.java @@ -77,7 +77,7 @@ public class Recall implements ISkillHandler for (L2Object target1 : targets) { - if (!(target1 instanceof L2Character)) + if (!target1.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java index a2d1418019..17871f6442 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java @@ -112,7 +112,7 @@ public class SummonFriend implements ISkillHandler { for (L2Object target1 : targets) { - if (!(target1 instanceof L2Character)) + if (!target1.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java index f405318e20..d0b322282a 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java @@ -38,7 +38,7 @@ public class ZakenPlayer implements ISkillHandler { for (L2Object target1 : targets) { - if (!(target1 instanceof L2Character)) + if (!target1.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java index 12a29665b8..ccefdf50d8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java @@ -38,7 +38,7 @@ public class ZakenSelf implements ISkillHandler { for (L2Object target1 : targets) { - if (!(target1 instanceof L2Character)) + if (!target1.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java index 85cf44760c..8ff34d064e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java @@ -1402,7 +1402,7 @@ public abstract class L2Skill Env env = new Env(); env.player = activeChar; - if (target instanceof L2Character) + if (target.isCharacter()) { env.target = (L2Character) target; } @@ -1432,7 +1432,7 @@ public abstract class L2Skill // Get the L2Objcet targeted by the user of the skill at this moment final L2Object objTarget = activeChar.getTarget(); // If the L2Object targeted is a L2Character, it becomes the L2Character target - if (objTarget instanceof L2Character) + if (objTarget.isCharacter()) { target = (L2Character) objTarget; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 7535cca4ae..7599f14423 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1581,7 +1581,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder L2Character target; for (L2Object obj : getKnownList().getKnownObjects().values()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { if ((obj instanceof L2PetInstance) && (this instanceof L2PcInstance) && (((L2PetInstance) obj).getOwner() == (L2PcInstance) this)) { @@ -3195,7 +3195,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder *
* Assert :
*
- *
  • this instanceof L2Character

    • + *
  • this.isCharacter().

    • *
    Client packet ActionFailed player.sendPacket(ActionFailed.STATIC_PACKET); @@ -7668,7 +7668,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder } } - if ((attacker instanceof L2Character) && ((L2Character) attacker).isInsideZone(ZoneId.PEACE) + if (attacker.isCharacter() && ((L2Character) attacker).isInsideZone(ZoneId.PEACE) // the townzone has to be already peace zone // || TownManager.getInstance().getTown(attacker.getX(), attacker.getY(), attacker.getZ())!= null ) @@ -7676,7 +7676,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return true; } - if ((target instanceof L2Character) && ((L2Character) target).isInsideZone(ZoneId.PEACE) + if (target.isCharacter() && ((L2Character) target).isInsideZone(ZoneId.PEACE) // the townzone has to be already peace zone // || TownManager.getInstance().getTown(target.getX(), target.getY(), target.getZ())!= null ) @@ -8387,7 +8387,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder for (int i = 0; (targets != null) && (i < targets.length); i++) { - if (targets[i] instanceof L2Character) + if (targets[i].isCharacter()) { if (!Util.checkIfInRange(escapeRange, this, targets[i], true)) { @@ -8712,12 +8712,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Like L2OFF if the skill is BLOW the player doesn't auto attack // If on XML skill nextActionAttack = true the char auto attack // If CTRL is pressed the autoattack is aborted (like L2OFF) - if ((skilldat != null) && !skilldat.isCtrlPressed() && skill.nextActionIsAttack() && (_target != null) && (_target instanceof L2Character)) + if ((skilldat != null) && !skilldat.isCtrlPressed() && skill.nextActionIsAttack() && (_target != null) && _target.isCharacter()) { getAI().setIntention(AI_INTENTION_ATTACK, _target); } } - else if (skill.nextActionIsAttack() && (_target != null) && (_target instanceof L2Character)) + else if (skill.nextActionIsAttack() && (_target != null) && _target.isCharacter()) { getAI().setIntention(AI_INTENTION_ATTACK, _target); } @@ -8790,7 +8790,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder { for (L2Object target : targets) { - if ((target != null) && (target instanceof L2Character) && !((L2Character) target).isDead()) + if ((target != null) && target.isCharacter() && !((L2Character) target).isDead()) { final L2Character player = (L2Character) target; @@ -9048,7 +9048,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder // Do initial checkings for skills and set pvp flag/draw aggro when needed for (L2Object target : targets) { - if (target instanceof L2Character) + if (target.isCharacter()) { // Set some values inside target's instance for later use L2Character player = (L2Character) target; @@ -9066,7 +9066,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder * instanceof L2PcInstance) { sendPacket(SystemMessage.sendString("Target affected by weapon special ability!")); } } */ - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character targ = (L2Character) target; @@ -9476,7 +9476,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return false; } - if (target instanceof L2Character) + if (target.isCharacter()) { ((L2Character) target).sendPacket(new ValidateLocation(this)); sendPacket(new ValidateLocation(((L2Character) target))); @@ -9567,7 +9567,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return false; } - if (target instanceof L2Character) + if (target.isCharacter()) { ((L2Character) target).sendPacket(new ValidateLocation(this)); sendPacket(new ValidateLocation(((L2Character) target))); @@ -9628,7 +9628,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder return false; } - if (target instanceof L2Character) + if (target.isCharacter()) { if (isBehind(_target) || isFront(_target)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java index 6d89dfd083..48328f05aa 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java @@ -534,7 +534,7 @@ public class L2CubicInstance } // test owners target if it is valid then use it - if ((ownerTarget instanceof L2Character) && (ownerTarget != _owner.getPet()) && (ownerTarget != _owner)) + if (ownerTarget.isCharacter() && (ownerTarget != _owner.getPet()) && (ownerTarget != _owner)) { // target mob which has aggro on you or your summon if (ownerTarget instanceof L2Attackable) diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index edace422cc..d7fe749eaf 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -607,7 +607,7 @@ public class L2NpcInstance extends L2Character return 10000; } - if ((object instanceof L2FolkInstance) || !(object instanceof L2Character)) + if ((object instanceof L2FolkInstance) || !object.isCharacter()) { return 0; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 607bf8c662..972c19b7ba 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -1297,7 +1297,7 @@ public final class L2PcInstance extends L2Playable default: { L2Object mainTarget = skill.getFirstOfTargetList(L2PcInstance.this); - if ((mainTarget == null) || !(mainTarget instanceof L2Character)) + if ((mainTarget == null) || !mainTarget.isCharacter()) { return; } @@ -6893,7 +6893,7 @@ public final class L2PcInstance extends L2Playable } // Remove the L2PcInstance from the _statusListener of the old target if it was a L2Character - if (oldTarget instanceof L2Character) + if (oldTarget.isCharacter()) { ((L2Character) oldTarget).removeStatusListener(this); } @@ -6901,7 +6901,7 @@ public final class L2PcInstance extends L2Playable oldTarget = null; // Add the L2PcInstance to the _statusListener of the new target if it's a L2Character - if ((newTarget != null) && (newTarget instanceof L2Character)) + if ((newTarget != null) && newTarget.isCharacter()) { ((L2Character) newTarget).addStatusListener(this); TargetSelected my = new TargetSelected(getObjectId(), newTarget.getObjectId(), getX(), getY(), getZ()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java index 95987d0e80..554ddc69fe 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java @@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.L2CharacterAI; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Attackable; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.actor.instance.L2FolkInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -50,7 +49,7 @@ public class AttackableKnownList extends NpcKnownList } // Remove the L2Object from the _aggrolist of the L2Attackable - if ((object != null) && (object instanceof L2Character)) + if ((object != null) && object.isCharacter()) { getActiveChar().getAggroList().remove(object); } @@ -95,7 +94,7 @@ public class AttackableKnownList extends NpcKnownList @Override public int getDistanceToWatchObject(L2Object object) { - if ((object instanceof L2FolkInstance) || !(object instanceof L2Character)) + if ((object instanceof L2FolkInstance) || !object.isCharacter()) { return 0; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/CharKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/CharKnownList.java index 4148da653e..e285134e74 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/CharKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/CharKnownList.java @@ -147,7 +147,7 @@ public class CharKnownList extends ObjectKnownList for (L2Object obj : getKnownObjects().values()) { - if ((obj != null) && (obj instanceof L2Character)) + if ((obj != null) && obj.isCharacter()) { result.add((L2Character) obj); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/FriendlyMobKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/FriendlyMobKnownList.java index 9b0b02247e..ef94e142b3 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/FriendlyMobKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/FriendlyMobKnownList.java @@ -67,7 +67,7 @@ public class FriendlyMobKnownList extends AttackableKnownList return false; } - if (!(object instanceof L2Character)) + if (!object.isCharacter()) { return true; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/MonsterKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/MonsterKnownList.java index 1dd8c626ed..1bfe4c2a59 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/MonsterKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/MonsterKnownList.java @@ -68,7 +68,7 @@ public class MonsterKnownList extends AttackableKnownList return false; } - if (!(object instanceof L2Character)) + if (!object.isCharacter()) { return true; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/NpcKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/NpcKnownList.java index c63fb120c1..4f1edf1dd6 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/NpcKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/NpcKnownList.java @@ -46,7 +46,7 @@ public class NpcKnownList extends CharKnownList return false; } - if (getActiveObject().isNpc() && (object instanceof L2Character)) + if (getActiveObject().isNpc() && object.isCharacter()) { // Broadcast correct walking NPC position. if (object.isPlayer() && getActiveChar().isMoving() && !getActiveChar().isInCombat()) @@ -77,7 +77,7 @@ public class NpcKnownList extends CharKnownList return 10000; } - if ((object instanceof L2FolkInstance) || !(object instanceof L2Character)) + if ((object instanceof L2FolkInstance) || !object.isCharacter()) { return 0; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java index be6395788f..572da3d4be 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java @@ -114,7 +114,7 @@ public class ObjectKnownList public final synchronized void updateKnownObjects() { // Only bother updating knownobjects for L2Character; don't for L2Object - if (_activeObject instanceof L2Character) + if (_activeObject.isCharacter()) { findCloseObjects(); forgetObjects(); @@ -150,7 +150,7 @@ public class ObjectKnownList // Try to add active object to object's known objects // Only if object is a L2Character and active object is a L2PlayableInstance - if (object instanceof L2Character) + if (object.isCharacter()) { object.getKnownList().addKnownObject(_activeObject); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java index 61e50d9982..41b73cedb7 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java @@ -229,7 +229,7 @@ public class PcKnownList extends PlayableKnownList } } - if (object instanceof L2Character) + if (object.isCharacter()) { // Update the state of the L2Character object client side by sending Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance L2Character obj = (L2Character) object; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java index f8d2402af1..254bcaa1e9 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java @@ -23,7 +23,6 @@ import com.l2jmobius.commons.util.Point3D; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2WorldRegion; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; /** @@ -107,7 +106,7 @@ public class ObjectPosition ((L2PcInstance) _activeObject).sendMessage("Error with your coords, Please ask a GM for help!"); } - else if (_activeObject instanceof L2Character) + else if (_activeObject.isCharacter()) { _activeObject.decayMe(); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index 026fffe67e..77b5533fb0 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -120,7 +120,7 @@ public final class Action extends L2GameClientPacket } case 1: { - if ((obj instanceof L2Character) && ((L2Character) obj).isAlikeDead()) + if (obj.isCharacter() && ((L2Character) obj).isAlikeDead()) { obj.onAction(activeChar); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 76529c5278..941d6a0b63 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -747,7 +747,7 @@ public final class RequestActionUse extends L2GameClientPacket boolean force = _ctrlPressed; - if (target instanceof L2Character) + if (target.isCharacter()) { if (activeSummon.isInsideZone(ZoneId.PVP) && ((L2Character) target).isInsideZone(ZoneId.PVP)) { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java index 999dffd24c..20741df547 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java @@ -160,7 +160,7 @@ public class RequestRecordInfo extends L2GameClientPacket } } - if (object instanceof L2Character) + if (object.isCharacter()) { // Update the state of the L2Character object client side by sending Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance final L2Character obj = (L2Character) object; diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 0b8b88006b..abad3508ad 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -225,7 +225,7 @@ public final class Say2 extends L2GameClientPacket final CreatureSay cs = new CreatureSay(actor, _type, name, _text); for (L2Object obj : list) { - if ((obj == null) || !(obj instanceof L2Character)) + if ((obj == null) || !obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java index e765165e7c..6ee7b513d5 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java @@ -90,7 +90,7 @@ public class NpcInfoPoly extends L2GameServerPacket _isSummoned = false; _collisionRadius = _template.collisionRadius; _collisionHeight = _template.collisionHeight; - if (_obj instanceof L2Character) + if (_obj.isCharacter()) { _activeChar = (L2Character) obj; _isAttackable = obj.isAutoAttackable(attacker); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectConfusion.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectConfusion.java index b9a3d74960..6226aa0e87 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectConfusion.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/effects/EffectConfusion.java @@ -71,7 +71,7 @@ final class EffectConfusion extends L2Effect continue; } - if ((obj instanceof L2Character) && (obj != getEffected())) + if (obj.isCharacter() && (obj != getEffected())) { targetList.add((L2Character) obj); } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java index 582be07c0e..2f17d7dee8 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java @@ -22,7 +22,6 @@ import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.L2WorldRegion; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; public class KnownListUpdateTaskManager @@ -118,7 +117,7 @@ public class KnownListUpdateTaskManager } } } - else if (object instanceof L2Character) + else if (object.isCharacter()) { for (L2WorldRegion regi : region.getSurroundingRegions()) // offer members of this and surrounding regions { diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java index d413849e72..155201436b 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java @@ -177,11 +177,11 @@ public final class Util } int rad = 0; - if (obj1 instanceof L2Character) + if (obj1.isCharacter()) { rad += ((L2Character) obj1).getTemplate().collisionRadius; } - if (obj2 instanceof L2Character) + if (obj2.isCharacter()) { rad += ((L2Character) obj2).getTemplate().collisionRadius; } diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java index d2688468dc..71d7519093 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/status/GameStatusThread.java @@ -1097,7 +1097,7 @@ public class GameStatusThread extends Thread { continue; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { if (((L2Character) obj).hasAI()) { @@ -1144,7 +1144,7 @@ public class GameStatusThread extends Thread { doorCount++; } - else if (obj instanceof L2Character) + else if (obj.isCharacter()) { charCount++; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index f6ec5a1a96..e1b81b429e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -266,7 +266,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -299,7 +299,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -323,7 +323,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.startAbnormalVisualEffect(true, AbnormalVisualEffect.BIG_HEAD); @@ -339,7 +339,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.stopAbnormalVisualEffect(true, AbnormalVisualEffect.BIG_HEAD); @@ -403,7 +403,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -549,7 +549,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -601,7 +601,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (character.hasAbnormalVisualEffect(ave)) @@ -621,7 +621,7 @@ public class AdminEffects implements IAdminCommandHandler { try { - if (target instanceof L2Character) + if (target.isCharacter()) { if (target instanceof L2ChestInstance) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index a1026ad0f9..37e45f9ded 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -114,7 +114,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 058ead60c2..05a257fd0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -109,7 +109,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 17624f4a89..660a752d26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 146959a21d..d535965f45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 00360d52fa..1917490f2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -53,7 +53,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -160,7 +160,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index ac58da9ed9..9ce69be554 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 85cbd2c171..9dc782a0de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } 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 f29e557b1e..9c6311cc51 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 @@ -605,7 +605,7 @@ public abstract class AbstractAI implements Ctrl } // Send a Server->Client packet MoveToPawn/CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers - if (pawn instanceof L2Character) + if (pawn.isCharacter()) { if (_actor.isOnGeodataPath()) { 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 508a97a9a0..271fab4572 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 @@ -2070,7 +2070,7 @@ public class L2AttackableAI extends L2CharacterAI { continue; } - final L2Character obj = target instanceof L2Character ? (L2Character) target : null; + final L2Character obj = target.isCharacter() ? (L2Character) target : null; if ((obj == null) || !GeoEngine.getInstance().canSeeTarget(actor, obj) || (dist2 > range)) { continue; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index a4eb31029e..b34a8ecd43 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -477,7 +477,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index ca99081294..69f80a4f5a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -128,7 +128,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index c87a02686a..d9f6c8631a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index ceb802e7b1..d085e0a561 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -5286,7 +5286,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final List targetList = new ArrayList<>(); for (L2Object target : targets) { - if (target instanceof L2Character) + if (target.isCharacter()) { if (!isInsideRadius(target.getX(), target.getY(), target.getZ(), escapeRange + _template.getCollisionRadius(), true, false)) { @@ -5535,7 +5535,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Attack target after skill use - if ((skill.nextActionIsAttack()) && (_target instanceof L2Character) && (_target != this) && (target != null) && (_target == target) && target.canBeAttacked()) + if ((skill.nextActionIsAttack()) && _target.isCharacter() && (_target != this) && (target != null) && (_target == target) && target.canBeAttacked()) { if ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)) { @@ -5845,7 +5845,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return false; } - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character target1 = (L2Character) target; angleChar = Util.calculateAngleFrom(this, target1); @@ -5929,7 +5929,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isInFrontOfTarget() { final L2Object target = _target; - if (target instanceof L2Character) + if (target.isCharacter()) { return isInFrontOf((L2Character) target); } 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 f6159a2eea..eb819f099b 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 @@ -4736,7 +4736,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; 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 8f250e39fd..ebb4fc5b6d 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 @@ -820,7 +820,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index 29806749ff..b7af96a66f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -1020,7 +1020,7 @@ public final class Skill implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition cond : preCondition) { if (!cond.test(activeChar, target, this)) @@ -1064,7 +1064,7 @@ public final class Skill implements IIdentifiable // Get the L2Objcet targeted by the user of the skill at this moment final L2Object objTarget = activeChar.getTarget(); // If the L2Object targeted is a L2Character, it becomes the L2Character target - if (objTarget instanceof L2Character) + if ((objTarget != null) && objTarget.isCharacter()) { target = (L2Character) objTarget; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java index 678f767a48..8a952011dd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java @@ -58,7 +58,7 @@ public class RequestRecordInfo implements IClientIncomingPacket { object.sendInfo(activeChar); - if (object instanceof L2Character) + if (object.isCharacter()) { // Update the state of the L2Character object client // side by sending Server->Client packet diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java index e9d4c34b78..ae3d7cc408 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java @@ -201,11 +201,11 @@ public final class Util } int radius = 0; - if (obj1 instanceof L2Character) + if (obj1.isCharacter()) { radius += ((L2Character) obj1).getTemplate().getCollisionRadius(); } - if (obj2 instanceof L2Character) + if (obj2.isCharacter()) { radius += ((L2Character) obj2).getTemplate().getCollisionRadius(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3800fb2e8b..07167d911e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index d492ebdb42..35650f8bab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4652,7 +4652,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java index 26e11555ac..02fb35cdc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -804,7 +804,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 39a3e579e2..2c05bb387e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 2c9f2381ed..a69d3861b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4652,7 +4652,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java index 26e11555ac..02fb35cdc6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -804,7 +804,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 39a3e579e2..2c05bb387e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java index 70a1570892..f4c750c59d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java @@ -284,7 +284,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -318,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; if (type.equals("1")) @@ -343,7 +343,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -359,7 +359,7 @@ public class AdminEffects implements IAdminCommandHandler { final L2Object target = activeChar.getTarget(); L2Character player = null; - if (target instanceof L2Character) + if (target.isCharacter()) { player = (L2Character) target; player.getEffectList().stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD); @@ -421,7 +421,7 @@ public class AdminEffects implements IAdminCommandHandler { final Team team = Team.valueOf(st.nextToken().toUpperCase()); L2Character target = null; - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { target = (L2Character) activeChar.getTarget(); } @@ -605,7 +605,7 @@ public class AdminEffects implements IAdminCommandHandler { obj = activeChar; } - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } @@ -686,7 +686,7 @@ public class AdminEffects implements IAdminCommandHandler */ private boolean performAbnormalVisualEffect(AbnormalVisualEffect ave, L2Object target) { - if (target instanceof L2Character) + if (target.isCharacter()) { final L2Character character = (L2Character) target; if (!character.getEffectList().hasAbnormalVisualEffect(ave)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java index ba0a172f18..b62ed39907 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java @@ -115,7 +115,7 @@ public class AdminHeal implements IAdminCommandHandler { obj = activeChar; } - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character target = (L2Character) obj; target.setCurrentHpMp(target.getMaxHp(), target.getMaxMp()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java index d856879106..d002495ba5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java @@ -62,7 +62,7 @@ public class AdminInvul implements IAdminCommandHandler else if (command.equals("admin_setundying")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2Character) + if (target.isCharacter()) { handleUndying(activeChar, (L2Character) target); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index f5f98c6c66..944f619e0b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -110,7 +110,7 @@ public class AdminKill implements IAdminCommandHandler else { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2ControllableMobInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2ControllableMobInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 929e600228..5c900c3875 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -94,7 +94,7 @@ public class AdminMobGroup implements IAdminCommandHandler } else if (command.startsWith("admin_mobgroup_attack")) { - if (activeChar.getTarget() instanceof L2Character) + if (activeChar.getTarget().isCharacter()) { final L2Character target = (L2Character) activeChar.getTarget(); attack(command, activeChar, target); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index 40bd10f525..f32d45d999 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -492,7 +492,7 @@ public final class AdminPForge implements IAdminCommandHandler case "$ttitle": { target = activeChar.getTarget(); - if ((target != null) && (target instanceof L2Character)) + if ((target != null) && target.isCharacter()) { value = ((L2Character) target).getTitle(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java index 9a30d2a47b..7a423a5bdc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java @@ -52,7 +52,7 @@ public class AdminPolymorph implements IAdminCommandHandler else if (command.startsWith("admin_untransform")) { final L2Object obj = activeChar.getTarget(); - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).stopTransformation(true); } @@ -159,7 +159,7 @@ public class AdminPolymorph implements IAdminCommandHandler { obj.getPoly().setPolyInfo(type, id); // animation - if (obj instanceof L2Character) + if (obj.isCharacter()) { final L2Character Char = (L2Character) obj; final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index eaeebd3cb5..65f80e0630 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -45,7 +45,7 @@ public class AdminTargetSay implements IAdminCommandHandler try { final L2Object obj = activeChar.getTarget(); - if ((obj instanceof L2StaticObjectInstance) || !(obj instanceof L2Character)) + if ((obj instanceof L2StaticObjectInstance) || !obj.isCharacter()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); return false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java index 32ce29e8af..f3ee064b7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java @@ -97,7 +97,7 @@ public class AdminTest implements IAdminCommandHandler { L2Character caster; final L2Object target = activeChar.getTarget(); - if (!(target instanceof L2Character)) + if (!target.isCharacter()) { caster = activeChar; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java index a800488401..8b0bde04bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -700,7 +700,7 @@ public abstract class AbstractAI implements Ctrl public boolean isFollowing() { - return (_target instanceof L2Character) && (_intention == AI_INTENTION_FOLLOW); + return (_target != null) && _target.isCharacter() && (_intention == AI_INTENTION_FOLLOW); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 5903758cb5..ec33f3abb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -487,7 +487,7 @@ public class GeoEngine // get origin and target height, real height = collision height * 2 double oheight = 0; - if (origin instanceof L2Character) + if (origin.isCharacter()) { oheight = ((L2Character) origin).getTemplate().getCollisionHeight(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0522c9ea2b..a7b515d858 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -126,7 +126,7 @@ public final class ZoneManager implements IGameXmlReader // Re-validate all characters in zones for (L2Object obj : L2World.getInstance().getVisibleObjects()) { - if (obj instanceof L2Character) + if (obj.isCharacter()) { ((L2Character) obj).revalidateZone(true); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java index df5da1b8ba..f29230697e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2CommandChannel.java @@ -194,7 +194,7 @@ public class L2CommandChannel extends AbstractPlayerGroup */ public boolean meetRaidWarCondition(L2Object obj) { - if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) + if (!(obj.isCharacter() && ((L2Character) obj).isRaid())) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 080eca1334..aafb7dcd4f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4653,7 +4653,7 @@ public final class L2PcInstance extends L2Playable oldTarget.removeStatusListener(this); } - if (newTarget instanceof L2Character) + if ((newTarget != null) && newTarget.isCharacter()) { final L2Character target = (L2Character) newTarget; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java index 26e11555ac..02fb35cdc6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -804,7 +804,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable return true; } - final L2Character target = (object instanceof L2Character) ? (L2Character) object : null; + final L2Character target = object.isCharacter() ? (L2Character) object : null; for (Condition preCondition : _preConditions) { if (preCondition == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 39a3e579e2..2c05bb387e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -588,7 +588,7 @@ public class SkillCaster implements Runnable { for (L2Object obj : targets) { - if (!(obj instanceof L2Character)) + if (!obj.isCharacter()) { continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/log/formatter/DamageFormatter.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/log/formatter/DamageFormatter.java index 3ba0a5856f..9f6bcc6c96 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/log/formatter/DamageFormatter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/log/formatter/DamageFormatter.java @@ -49,7 +49,7 @@ public class DamageFormatter extends Formatter if (p instanceof L2Character) { - if ((p instanceof L2Character) && ((L2Character) p).isRaid()) + if (((L2Character) p).isRaid()) { StringUtil.append(output, "RaidBoss "); }