Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3920: Make player inventories consistently return null for empty stacks

Browse Source
This commit is contained in:
md_5 2018-05-04 17:09:46 +10:00
parent 1988d7f104
commit ca057a3457
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -46,7 +46,10 @@ public class CraftInventory implements Inventory {
} }
public ItemStack getItem(int index) { 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); return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
} }
@ -56,7 +59,7 @@ public class CraftInventory implements Inventory {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
net.minecraft.server.ItemStack mcItem = mcItems.get(i); net.minecraft.server.ItemStack mcItem = mcItems.get(i);
items[i] = (mcItem.isEmpty()) ? null : CraftItemStack.asCraftMirror(mcItem); items[i] = asCraftMirror(mcItem);
} }
return items; return items;

4
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
View File

@ -29,7 +29,7 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@Override @Override
public ItemStack getItemInMainHand() { public ItemStack getItemInMainHand() {
return CraftItemStack.asCraftMirror(getInventory().getItemInHand()); return asCraftMirror(getInventory().getItemInHand());
} }
@Override @Override
@ -39,7 +39,7 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@Override @Override
public ItemStack getItemInOffHand() { public ItemStack getItemInOffHand() {
return CraftItemStack.asCraftMirror(getInventory().extraSlots.get(0)); return asCraftMirror(getInventory().extraSlots.get(0));
} }
@Override @Override