summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockPumpkin.patch
blob: 77cac22aab74d7e61c3727f1574b53311ee0c403 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
--- /home/matt/mc-dev-private//net/minecraft/server/BlockPumpkin.java	2015-02-26 22:40:22.223608143 +0000
+++ src/main/java/net/minecraft/server/BlockPumpkin.java	2015-02-26 22:40:22.223608143 +0000
@@ -2,6 +2,12 @@
 
 import com.google.common.base.Predicate;
 
+// 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 BlockDirectional {
 
     private ShapeDetector snowGolemPart;
@@ -40,17 +46,24 @@
         int j;
 
         if ((shapedetector_shapedetectorcollection = this.getDetectorSnowGolem().a(world, blockposition)) != null) {
+            BlockStateListPopulator blockList = new BlockStateListPopulator(world.getWorld()); // CraftBukkit - Use BlockStateListPopulator
             for (i = 0; i < this.getDetectorSnowGolem().b(); ++i) {
                 ShapeDetectorBlock shapedetectorblock = shapedetector_shapedetectorcollection.a(0, i, 0);
 
-                world.setTypeAndData(shapedetectorblock.d(), Blocks.AIR.getBlockData(), 2);
+                // CraftBukkit start
+                // world.setTypeAndData(shapedetectorblock.d(), Blocks.AIR.getBlockData(), 2);
+                BlockPosition pos = shapedetectorblock.d();
+                blockList.setTypeId(pos.getX(), pos.getY(), pos.getZ(), 0);
+                // CraftBukkit end
             }
 
             EntitySnowman entitysnowman = new EntitySnowman(world);
             BlockPosition blockposition1 = shapedetector_shapedetectorcollection.a(0, 2, 0).d();
 
             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();
 
             for (j = 0; j < 120; ++j) {
                 world.addParticle(EnumParticle.SNOW_SHOVEL, (double) blockposition1.getX() + world.random.nextDouble(), (double) blockposition1.getY() + world.random.nextDouble() * 2.5D, (double) blockposition1.getZ() + world.random.nextDouble(), 0.0D, 0.0D, 0.0D, new int[0]);
@@ -61,10 +74,16 @@
 
                 world.update(shapedetectorblock1.d(), Blocks.AIR);
             }
+            } // CraftBukkit end
         } else if ((shapedetector_shapedetectorcollection = this.getDetectorIronGolem().a(world, blockposition)) != null) {
+            BlockStateListPopulator blockList = new BlockStateListPopulator(world.getWorld()); // CraftBukkit - Use BlockStateListPopulator
             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).d(), Blocks.AIR.getBlockData(), 2);
+                    // CraftBukkit start
+                    // world.setTypeAndData(shapedetectorcollection.a(i, k, 0).d(), Blocks.AIR.getBlockData(), 2);
+                    BlockPosition pos = shapedetector_shapedetectorcollection.a(i, k, 0).d();
+                    blockList.setTypeId(pos.getX(), pos.getY(), pos.getZ(), 0);
+                    // CraftBukkit end
                 }
             }
 
@@ -73,7 +92,10 @@
 
             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();
 
             for (j = 0; j < 120; ++j) {
                 world.addParticle(EnumParticle.SNOWBALL, (double) blockposition2.getX() + world.random.nextDouble(), (double) blockposition2.getY() + world.random.nextDouble() * 3.9D, (double) blockposition2.getZ() + world.random.nextDouble(), 0.0D, 0.0D, 0.0D, new int[0]);
@@ -86,6 +108,7 @@
                     world.update(shapedetectorblock2.d(), Blocks.AIR);
                 }
             }
+            } // CraftBukkit end
         }
 
     }