From 1df749fff3754c4b9046bd4e9901177322dae6ac Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 14 Jan 2022 07:00:51 +0000 Subject: [PATCH] AdminKill handler null target fix. Contributed by CostyKiller. --- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminKill.java | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 00323a8135..d8869f1c2f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -107,7 +107,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 00323a8135..d8869f1c2f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -107,7 +107,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java index 5e38b98585..f10950ef04 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java @@ -108,7 +108,7 @@ public class AdminKill implements IAdminCommandHandler else { final WorldObject obj = activeChar.getTarget(); - if ((obj instanceof ControllableMob) || !obj.isCreature()) + if ((obj == null) || (obj instanceof ControllableMob) || !obj.isCreature()) { activeChar.sendPacket(SystemMessageId.INVALID_TARGET); }