From 62d13da4f1288d50d15c2d1b5bcf1f2a9c237e8f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened by plugins diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java index 343670b20..6960ad433 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; public class InventoryEnderChest extends InventorySubcontainer { - private TileEntityEnderChest a; + private TileEntityEnderChest a; public TileEntityEnderChest getTileEntity() { return a; } // Paper - OBFHELPER // CraftBukkit start private final EntityHuman owner; @@ -15,6 +15,7 @@ public class InventoryEnderChest extends InventorySubcontainer { @Override public Location getLocation() { + if (getTileEntity() == null) return null; // Paper - return null if there is no TE bound (opened by plugin) return new Location(this.a.getWorld().getWorld(), this.a.getPosition().getX(), this.a.getPosition().getY(), this.a.getPosition().getZ()); } -- 2.21.0