From 7c2b0ab69e7a88555ca612ef64dfeb867548a66b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 2 Mar 2016 06:31:11 +1100
Subject: [PATCH] SPIGOT-1596: BlockCauldron crash

---
 nms-patches/BlockCauldron.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nms-patches/BlockCauldron.patch b/nms-patches/BlockCauldron.patch
index 110e170d0d..716766ba7d 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()) {