Fixed probable NPE when admin uses not owned items.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2022-07-28 12:11:56 +00:00
parent 0dd4940967
commit 6eb6b14ebd
46 changed files with 46 additions and 46 deletions

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -105,7 +105,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -105,7 +105,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -105,7 +105,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -105,7 +105,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -104,7 +104,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -100,7 +100,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -105,7 +105,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -102,7 +102,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -108,7 +108,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -102,7 +102,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -110,7 +110,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -102,7 +102,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -110,7 +110,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }

View File

@ -102,7 +102,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
if (_count > ((Item) obj).getCount()) if (_count > ((Item) obj).getCount())
{ {

View File

@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket
if (player.isGM()) if (player.isGM())
{ {
final WorldObject obj = World.getInstance().findObject(_objectId); final WorldObject obj = World.getInstance().findObject(_objectId);
if (obj.isItem()) if ((obj != null) && obj.isItem())
{ {
AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true); AdminCommandHandler.getInstance().useAdminCommand(player, "admin_use_item " + _objectId, true);
} }