From 3de6ee7291771c6fa07aefa6877ba67453ea3550 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 8 Jun 2022 11:17:56 +0000 Subject: [PATCH] Fixed probable admin_setclass NPE. --- .../scripts/handlers/admincommandhandlers/AdminEditChar.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminEditChar.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminEditChar.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index b61ad3608c..1f80dda5ac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -419,7 +419,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sylph checks - if (!CategoryData.getInstance().isInCategory(CategoryType.SYLPH_ALL_CLASS, classidval) && (player.getActiveWeaponItem().getItemType() == WeaponType.PISTOLS)) + if (!CategoryData.getInstance().isInCategory(CategoryType.SYLPH_ALL_CLASS, classidval) && ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getItemType() == WeaponType.PISTOLS))) { final Item itemToRemove = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (itemToRemove != null) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index b61ad3608c..1f80dda5ac 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -419,7 +419,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sylph checks - if (!CategoryData.getInstance().isInCategory(CategoryType.SYLPH_ALL_CLASS, classidval) && (player.getActiveWeaponItem().getItemType() == WeaponType.PISTOLS)) + if (!CategoryData.getInstance().isInCategory(CategoryType.SYLPH_ALL_CLASS, classidval) && ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getItemType() == WeaponType.PISTOLS))) { final Item itemToRemove = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (itemToRemove != null) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index f452e5e5f9..313143b884 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -419,7 +419,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sylph checks - if (!CategoryData.getInstance().isInCategory(CategoryType.SYLPH_ALL_CLASS, classidval) && (player.getActiveWeaponItem().getItemType() == WeaponType.PISTOLS)) + if (!CategoryData.getInstance().isInCategory(CategoryType.SYLPH_ALL_CLASS, classidval) && ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getItemType() == WeaponType.PISTOLS))) { final Item itemToRemove = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (itemToRemove != null)