From ca057a3457d376b4c38c9765713169505dc17c98 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 May 2018 17:09:46 +1000 Subject: SPIGOT-3920: Make player inventories consistently return null for empty stacks --- src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java | 7 +++++-- .../org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 4866d1ae..40a73fe8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -46,7 +46,10 @@ public class CraftInventory implements Inventory { } public ItemStack getItem(int index) { - net.minecraft.server.ItemStack item = getInventory().getItem(index); + return asCraftMirror(getInventory().getItem(index)); + } + + protected static ItemStack asCraftMirror(net.minecraft.server.ItemStack item) { return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item); } @@ -56,7 +59,7 @@ public class CraftInventory implements Inventory { for (int i = 0; i < size; i++) { net.minecraft.server.ItemStack mcItem = mcItems.get(i); - items[i] = (mcItem.isEmpty()) ? null : CraftItemStack.asCraftMirror(mcItem); + items[i] = asCraftMirror(mcItem); } return items; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java index 67c54899..0c015d2f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -29,7 +29,7 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @Override public ItemStack getItemInMainHand() { - return CraftItemStack.asCraftMirror(getInventory().getItemInHand()); + return asCraftMirror(getInventory().getItemInHand()); } @Override @@ -39,7 +39,7 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @Override public ItemStack getItemInOffHand() { - return CraftItemStack.asCraftMirror(getInventory().extraSlots.get(0)); + return asCraftMirror(getInventory().extraSlots.get(0)); } @Override -- cgit v1.2.3