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