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

Accounted for NMS getItem() returning null in recent commit.

Browse Source
This commit is contained in:
EvilSeph 2012-01-20 11:45:37 -05:00
parent 85ab95cec7
commit 1bbeec1f75
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minecraft/server/EntityTrackerEntry.java
View File

@ -241,6 +241,7 @@ public class EntityTrackerEntry {
if (this.tracker instanceof EntityItem) {
EntityItem entityitem = (EntityItem) this.tracker;
if (entityitem.dead|| entityitem.itemStack == null) return null; // CraftBukkit
Packet21PickupSpawn packet21pickupspawn = new Packet21PickupSpawn(entityitem);
entityitem.locX = (double) packet21pickupspawn.b / 32.0D;

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

@ -27,7 +27,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
public ItemStack getItem(int index) {
return getInventory().getItem(index).id == 0 ? null : new CraftItemStack(getInventory().getItem(index));
return (getInventory().getItem(index) == null || getInventory().getItem(index).id == 0) ? null : new CraftItemStack(getInventory().getItem(index));
}
public ItemStack[] getContents() {