Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-11 10:01:55 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NPE while clearing a slot

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot 2011-01-16 14:34:31 +01:00
parent ffc7372165
commit 2f53dbcd0f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java Normal file → Executable file
View File

@ -43,8 +43,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
public void setContents(ItemStack[] items) { public void setContents(ItemStack[] items) {
if (getInventory().getContents().length != items.length) { if (getInventory().getContents().length != items.length) {
throw new IllegalArgumentException("Invalid inventory size; expected " throw new IllegalArgumentException("Invalid inventory size; expected " + getInventory().getContents().length);
+ getInventory().getContents().length);
} }
net.minecraft.server.ItemStack[] mcItems = getInventory().getContents(); net.minecraft.server.ItemStack[] mcItems = getInventory().getContents();
@ -54,15 +53,13 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
if (item == null) { if (item == null) {
mcItems[i] = null; mcItems[i] = null;
} else { } else {
mcItems[i] = new net.minecraft.server.ItemStack( mcItems[i] = new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDamage());
item.getTypeId(), item.getAmount(), item.getDamage());
} }
} }
} }
public void setItem(int index, ItemStack item) { public void setItem(int index, ItemStack item) {
getInventory().a(index, new net.minecraft.server.ItemStack( getInventory().a(index, (item == null ? null : new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDamage())));
item.getTypeId(), item.getAmount(), item.getDamage()));
} }
public boolean contains(int materialId) { public boolean contains(int materialId) {