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

AdminKill handler null target fix.

Browse Source 
Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2022-01-14 07:00:51 +00:00
parent b77aed5b99
commit 1df749fff3
23 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

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

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

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

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

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

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -107,7 +107,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

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

@@ -107,7 +107,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }

2
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java vendored
View File

@@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler
else else
{ {
final WorldObject obj = activeChar.getTarget(); final WorldObject obj = activeChar.getTarget();
if ((obj instanceof ControllableMob) || !obj.isCreature()) if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature())
{ {
activeChar.sendPacket(SystemMessageId.INVALID_TARGET); activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
} }