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

16
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/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_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/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_CT_2.6_HighFive/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_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/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;
}

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -5286,7 +5286,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final List<L2Object> 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);
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

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

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
View File

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

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java
View File

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

2
L2J_Mobius_CT_2.6_HighFive/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 ");
}