Fixed probable admin_setclass NPE.

This commit is contained in:
MobiusDevelopment
2022-06-08 11:17:56 +00:00
parent 8f34090a81
commit 3de6ee7291
3 changed files with 3 additions and 3 deletions

View File

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

View File

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

View File

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