diff --git a/src/main/java/com/comandante/creeper/server/command/UseCommand.java b/src/main/java/com/comandante/creeper/server/command/UseCommand.java index 3ff1f7e4ff8b60ba9f89c6b8adb135c6150c869b..acb697f08e67ae40ce7a5b7e961589a81117ea5a 100644 --- a/src/main/java/com/comandante/creeper/server/command/UseCommand.java +++ b/src/main/java/com/comandante/creeper/server/command/UseCommand.java @@ -31,14 +31,18 @@ public class UseCommand extends Command { } originalMessageParts.remove(0); String itemTarget = Joiner.on(" ").join(originalMessageParts); - for (String inventoryId : playerMetadata.getInventory()) { - Item itemEntity = entityManager.getItemEntity(inventoryId); - if (itemEntity.getItemTriggers().contains(itemTarget)) { - new ItemUseHandler(itemEntity, creeperSession, gameManager, playerId).handle(); - return; + if (playerMetadata.getInventory() != null) { + for (String inventoryId : playerMetadata.getInventory()) { + Item itemEntity = entityManager.getItemEntity(inventoryId); + if (itemEntity.getItemTriggers().contains(itemTarget)) { + new ItemUseHandler(itemEntity, creeperSession, gameManager, playerId).handle(); + return; + } } + new ItemUseHandler(ItemType.UNKNOWN.create(), creeperSession, gameManager, playerId).handle(); + } else { + write("Your inventory is empty."); } - new ItemUseHandler(ItemType.UNKNOWN.create(), creeperSession, gameManager, playerId).handle(); } finally { super.messageReceived(ctx, e); }