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
Download Patch File Download Diff File Expand all files Collapse all files

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