summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockCauldron.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-02 06:31:11 +1100
committermd_5 <git@md-5.net>2016-03-02 06:31:11 +1100
commit7c2b0ab69e7a88555ca612ef64dfeb867548a66b (patch)
treeac0ff4bfdee78e20959c93fd0d46c2c6dc1ec3af /nms-patches/BlockCauldron.patch
parent0f297b39be46c8c30df85d4c5a44f680026163cc (diff)
downloadcraftbukkit-7c2b0ab69e7a88555ca612ef64dfeb867548a66b.tar
craftbukkit-7c2b0ab69e7a88555ca612ef64dfeb867548a66b.tar.gz
craftbukkit-7c2b0ab69e7a88555ca612ef64dfeb867548a66b.tar.lz
craftbukkit-7c2b0ab69e7a88555ca612ef64dfeb867548a66b.tar.xz
craftbukkit-7c2b0ab69e7a88555ca612ef64dfeb867548a66b.zip
SPIGOT-1596: BlockCauldron crash
Diffstat (limited to 'nms-patches/BlockCauldron.patch')
-rw-r--r--nms-patches/BlockCauldron.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/BlockCauldron.patch b/nms-patches/BlockCauldron.patch
index 110e170d..716766ba 100644
--- a/nms-patches/BlockCauldron.patch
+++ b/nms-patches/BlockCauldron.patch
@@ -120,7 +120,7 @@
+ int newLevel = Integer.valueOf(MathHelper.clamp(i, 0, 3));
+ CauldronLevelChangeEvent event = new CauldronLevelChangeEvent(
+ world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()),
-+ entity.getBukkitEntity(), reason, iblockdata.get(BlockCauldron.LEVEL), newLevel
++ (entity == null) ? null : entity.getBukkitEntity(), reason, iblockdata.get(BlockCauldron.LEVEL), newLevel
+ );
+ world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {