diff --git a/nms-patches/TileEntity.patch b/nms-patches/TileEntity.patch
index 0fedbc1daa..dd6ab38bec 100644
--- a/nms-patches/TileEntity.patch
+++ b/nms-patches/TileEntity.patch
@@ -1,5 +1,5 @@
---- /home/matt/mc-dev-private//net/minecraft/server/TileEntity.java	2015-02-26 22:40:23.155608133 +0000
-+++ src/main/java/net/minecraft/server/TileEntity.java	2015-02-26 22:40:23.155608133 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/TileEntity.java	2015-03-22 19:45:21.425850820 +0000
++++ src/main/java/net/minecraft/server/TileEntity.java	2015-03-22 19:45:21.425850820 +0000
 @@ -6,6 +6,8 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
@@ -9,13 +9,14 @@
  public abstract class TileEntity {
  
      private static final Logger a = LogManager.getLogger();
-@@ -217,4 +219,12 @@
+@@ -217,4 +219,13 @@
          a(TileEntityFlowerPot.class, "FlowerPot");
          a(TileEntityBanner.class, "Banner");
      }
 +
 +    // CraftBukkit start - add method
 +    public InventoryHolder getOwner() {
++        if (world == null) return null;
 +        org.bukkit.block.BlockState state = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState();
 +        if (state instanceof InventoryHolder) return (InventoryHolder) state;
 +        return null;