diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-22 19:45:26 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-22 19:45:26 +0000 |
| commit | 7d0f836d0f3371f7a47c78c54091d8c83ea97c14 (patch) | |
| tree | 959212aeefb65cad99366930d547fa6feae8b3ba /nms-patches/TileEntity.patch | |
| parent | e387d8dc7752a7f03e6baa1dadaf66ec2e7e3512 (diff) | |
| download | craftbukkit-7d0f836d0f3371f7a47c78c54091d8c83ea97c14.tar craftbukkit-7d0f836d0f3371f7a47c78c54091d8c83ea97c14.tar.gz craftbukkit-7d0f836d0f3371f7a47c78c54091d8c83ea97c14.tar.lz craftbukkit-7d0f836d0f3371f7a47c78c54091d8c83ea97c14.tar.xz craftbukkit-7d0f836d0f3371f7a47c78c54091d8c83ea97c14.zip | |
SPIGOT-720: Fix NPE in TileEntity.getOwner
Diffstat (limited to 'nms-patches/TileEntity.patch')
| -rw-r--r-- | nms-patches/TileEntity.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nms-patches/TileEntity.patch b/nms-patches/TileEntity.patch index 0fedbc1d..dd6ab38b 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; |