--- a/net/minecraft/server/BlockPumpkin.java
+++ b/net/minecraft/server/BlockPumpkin.java
@@ -4,6 +4,12 @@
 import java.util.Iterator;
 import javax.annotation.Nullable;
 
+// CraftBukkit start
+import org.bukkit.craftbukkit.util.BlockStateListPopulator;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+// CraftBukkit end
+
 public class BlockPumpkin extends BlockFacingHorizontal {
 
     private ShapeDetector snowGolemPart;
@@ -43,18 +49,25 @@
         EntityPlayer entityplayer;
         int j;
 
+        BlockStateListPopulator blockList = new BlockStateListPopulator(world.getWorld()); // CraftBukkit - Use BlockStateListPopulator
         if (shapedetector_shapedetectorcollection != null) {
             for (i = 0; i < this.getDetectorSnowGolem().b(); ++i) {
                 ShapeDetectorBlock shapedetectorblock = shapedetector_shapedetectorcollection.a(0, i, 0);
 
-                world.setTypeAndData(shapedetectorblock.getPosition(), Blocks.AIR.getBlockData(), 2);
+                // CraftBukkit start
+                // world.setTypeAndData(shapedetectorblock.d(), Blocks.AIR.getBlockData(), 2);
+                BlockPosition pos = shapedetectorblock.getPosition();
+                blockList.setTypeId(pos.getX(), pos.getY(), pos.getZ(), 0);
+                // CraftBukkit end
             }
 
             EntitySnowman entitysnowman = new EntitySnowman(world);
             BlockPosition blockposition1 = shapedetector_shapedetectorcollection.a(0, 2, 0).getPosition();
 
             entitysnowman.setPositionRotation((double) blockposition1.getX() + 0.5D, (double) blockposition1.getY() + 0.05D, (double) blockposition1.getZ() + 0.5D, 0.0F, 0.0F);
-            world.addEntity(entitysnowman);
+            // CraftBukkit start
+            if (world.addEntity(entitysnowman, SpawnReason.BUILD_SNOWMAN)) {
+                blockList.updateList();
             iterator = world.a(EntityPlayer.class, entitysnowman.getBoundingBox().g(5.0D)).iterator();
 
             while (iterator.hasNext()) {
@@ -71,12 +84,17 @@
 
                 world.update(shapedetectorblock1.getPosition(), Blocks.AIR, false);
             }
+            } // CraftBukkit end
         } else {
             shapedetector_shapedetectorcollection = this.getDetectorIronGolem().a(world, blockposition);
             if (shapedetector_shapedetectorcollection != null) {
                 for (i = 0; i < this.getDetectorIronGolem().c(); ++i) {
                     for (int k = 0; k < this.getDetectorIronGolem().b(); ++k) {
-                        world.setTypeAndData(shapedetector_shapedetectorcollection.a(i, k, 0).getPosition(), Blocks.AIR.getBlockData(), 2);
+                        // CraftBukkit start
+                        // world.setTypeAndData(shapedetector_shapedetectorcollection.a(i, k, 0).getPosition(), Blocks.AIR.getBlockData(), 2);
+                        BlockPosition pos = shapedetector_shapedetectorcollection.a(i, k, 0).getPosition();
+                        blockList.setTypeId(pos.getX(), pos.getY(), pos.getZ(), 0);
+                        // CraftBukkit end
                     }
                 }
 
@@ -85,7 +103,9 @@
 
                 entityirongolem.setPlayerCreated(true);
                 entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
-                world.addEntity(entityirongolem);
+            // CraftBukkit start
+            if (world.addEntity(entityirongolem, SpawnReason.BUILD_IRONGOLEM)) {
+                blockList.updateList();
                 iterator = world.a(EntityPlayer.class, entityirongolem.getBoundingBox().g(5.0D)).iterator();
 
                 while (iterator.hasNext()) {
@@ -105,6 +125,7 @@
                     }
                 }
             }
+            } // CraftBukkit end
         }
 
     }