lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced instanceof L2Character with isCharacter method.

Browse Source
This commit is contained in:
MobiusDev 2018-06-30 16:42:41 +00:00
parent d806ff66e5
commit 049a9b02aa
179 changed files with 270 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -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))

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java vendored
View File

@ -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());

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java vendored
View File

@ -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);
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@ -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);
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@ -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);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@ -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();
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java vendored
View File

@ -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);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java vendored
View File

@ -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;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java vendored
View File

@ -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;
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -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);
}
/**

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -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();
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
View File

@ -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);
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2CommandChannel.java
View File

@ -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;
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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;

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

@ -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)

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -588,7 +588,7 @@ public class SkillCaster implements Runnable
{
for (L2Object obj : targets)
{
if (!(obj instanceof L2Character))
if (!obj.isCharacter())
{
continue;
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/log/formatter/DamageFormatter.java
View File

@ -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 ");
}

14
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -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))

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java vendored
View File

@ -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());

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java vendored
View File

@ -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);
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@ -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);
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@ -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);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@ -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();
}

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java vendored
View File

@ -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);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java vendored
View File

@ -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;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java vendored
View File

@ -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;
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -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);
}
/**

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -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();
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
View File

@ -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);
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2CommandChannel.java
View File

@ -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;
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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;

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

@ -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)

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -588,7 +588,7 @@ public class SkillCaster implements Runnable
{
for (L2Object obj : targets)
{
if (!(obj instanceof L2Character))
if (!obj.isCharacter())
{
continue;
}

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/log/formatter/DamageFormatter.java
View File

@ -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 ");
}

14
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -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))

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java vendored
View File

@ -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());

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java vendored
View File

@ -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);
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@ -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);
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@ -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);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@ -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();
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java vendored
View File

@ -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);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java vendored
View File

@ -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;

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java vendored
View File

@ -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;
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -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);
}
/**

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -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();
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
View File

@ -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);
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2CommandChannel.java
View File

@ -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;
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

@ -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)

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -588,7 +588,7 @@ public class SkillCaster implements Runnable
{
for (L2Object obj : targets)
{
if (!(obj instanceof L2Character))
if (!obj.isCharacter())
{
continue;
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/log/formatter/DamageFormatter.java
View File

@ -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 ");
}

14
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -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))

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java vendored
View File

@ -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());

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInvul.java vendored
View File

@ -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);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@ -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);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@ -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);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@ -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();
}

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java vendored
View File

@ -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);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java vendored
View File

@ -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;

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTest.java vendored
View File

@ -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;
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -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);
}
/**

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -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();
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
View File

@ -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);
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2CommandChannel.java
View File

@ -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;
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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;

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

@ -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)

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -588,7 +588,7 @@ public class SkillCaster implements Runnable
{
for (L2Object obj : targets)
{
if (!(obj instanceof L2Character))
if (!obj.isCharacter())
{
continue;
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/log/formatter/DamageFormatter.java
View File

@ -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 ");
}

9
L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg vendored
View File

@ -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

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java vendored
View File

@ -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))
{

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@ -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())
{

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@ -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;
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java
View File

@ -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())
{

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java
View File

@ -440,7 +440,7 @@ public class L2ControllableMobAI extends L2AttackableAI
for (L2Object obj : npc.getKnownList().getKnownObjects().values())
{
if (!(obj instanceof L2Character))
if (!obj.isCharacter())
{
continue;
}

16
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
View File

@ -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))
{

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHeal.java
View File

@ -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());

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminKill.java
View File

@ -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);
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java
View File

@ -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);

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminPolymorph.java
View File

@ -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);

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java
View File

@ -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;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/CombatPointHeal.java
View File

@ -53,7 +53,7 @@ public class CombatPointHeal implements ISkillHandler
for (L2Object object : targets)
{
if (!(object instanceof L2Character))
if (!object.isCharacter())
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Disablers.java
View File

@ -95,7 +95,7 @@ public class Disablers implements ISkillHandler
for (L2Object target2 : targets)
{
// Get a target
if (!(target2 instanceof L2Character))
if (!target2.isCharacter())
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Recall.java
View File

@ -77,7 +77,7 @@ public class Recall implements ISkillHandler
for (L2Object target1 : targets)
{
if (!(target1 instanceof L2Character))
if (!target1.isCharacter())
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
View File

@ -112,7 +112,7 @@ public class SummonFriend implements ISkillHandler
{
for (L2Object target1 : targets)
{
if (!(target1 instanceof L2Character))
if (!target1.isCharacter())
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java
View File

@ -38,7 +38,7 @@ public class ZakenPlayer implements ISkillHandler
{
for (L2Object target1 : targets)
{
if (!(target1 instanceof L2Character))
if (!target1.isCharacter())
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java
View File

@ -38,7 +38,7 @@ public class ZakenSelf implements ISkillHandler
{
for (L2Object target1 : targets)
{
if (!(target1 instanceof L2Character))
if (!target1.isCharacter())
{
continue;
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Skill.java
View File

@ -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;
}

28
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -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
* <BR>
* <B><U> Assert </U> :</B><BR>
* <BR>
* <li>this instanceof L2Character</li><BR>
* <li>this.isCharacter().</li><BR>
* <BR
* @param template the new template
*/
@ -7457,7 +7457,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
@Override
public void onForcedAttack(L2PcInstance player)
{
if ((player.getTarget() == null) || !(player.getTarget() instanceof L2Character))
if ((player.getTarget() == null) || !player.getTarget().isCharacter())
{
// If target is not attackable, send a Server->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))
{

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java
View File

@ -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)

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java
View File

@ -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;
}

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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());

5
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/AttackableKnownList.java
View File

@ -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;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/CharKnownList.java
View File

@ -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);
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/FriendlyMobKnownList.java
View File

@ -67,7 +67,7 @@ public class FriendlyMobKnownList extends AttackableKnownList
return false;
}
if (!(object instanceof L2Character))
if (!object.isCharacter())
{
return true;
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/MonsterKnownList.java
View File

@ -68,7 +68,7 @@ public class MonsterKnownList extends AttackableKnownList
return false;
}
if (!(object instanceof L2Character))
if (!object.isCharacter())
{
return true;
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/NpcKnownList.java
View File

@ -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;
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/ObjectKnownList.java
View File

@ -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);
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java
View File

@ -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;

3
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/position/ObjectPosition.java
View File

@ -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();
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Action.java
View File

@ -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);
}

Some files were not shown because too many files have changed in this diff Show More