summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockPumpkin.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockPumpkin.patch')
-rw-r--r--nms-patches/BlockPumpkin.patch87
1 files changed, 25 insertions, 62 deletions
diff --git a/nms-patches/BlockPumpkin.patch b/nms-patches/BlockPumpkin.patch
index 6e9c27e2..77cac22a 100644
--- a/nms-patches/BlockPumpkin.patch
+++ b/nms-patches/BlockPumpkin.patch
@@ -1,7 +1,8 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/BlockPumpkin.java 2014-11-28 17:43:42.945707438 +0000
-+++ src/main/java/net/minecraft/server/BlockPumpkin.java 2014-11-28 17:38:16.000000000 +0000
-@@ -1,5 +1,11 @@
- package net.minecraft.server;
+--- /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;
@@ -12,13 +13,13 @@
public class BlockPumpkin extends BlockDirectional {
private ShapeDetector snowGolemPart;
-@@ -29,31 +35,45 @@
+@@ -40,17 +46,24 @@
int j;
- if ((shapedetectorcollection = this.getDetectorSnowGolem().a(world, blockposition)) != null) {
+ 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 = shapedetectorcollection.a(0, i, 0);
+ ShapeDetectorBlock shapedetectorblock = shapedetector_shapedetectorcollection.a(0, i, 0);
- world.setTypeAndData(shapedetectorblock.d(), Blocks.AIR.getBlockData(), 2);
+ // CraftBukkit start
@@ -29,7 +30,7 @@
}
EntitySnowman entitysnowman = new EntitySnowman(world);
- BlockPosition blockposition1 = shapedetectorcollection.a(0, 2, 0).d();
+ 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);
@@ -37,81 +38,43 @@
+ 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]);
-- }
-+ 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]);
-+ }
-
-- for (j = 0; j < this.getDetectorSnowGolem().b(); ++j) {
-- ShapeDetectorBlock shapedetectorblock1 = shapedetectorcollection.a(0, j, 0);
-+ for (j = 0; j < this.getDetectorSnowGolem().b(); ++j) {
-+ ShapeDetectorBlock shapedetectorblock1 = shapedetectorcollection.a(0, j, 0);
+ 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);
-+ world.update(shapedetectorblock1.d(), Blocks.AIR);
-+ }
+ world.update(shapedetectorblock1.d(), Blocks.AIR);
}
-+ // CraftBukkit end
- } else if ((shapedetectorcollection = this.getDetectorIronGolem().a(world, blockposition)) != null) {
++ } // 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(shapedetectorcollection.a(i, k, 0).d(), Blocks.AIR.getBlockData(), 2);
+- 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 = shapedetectorcollection.a(i, k, 0).d();
++ BlockPosition pos = shapedetector_shapedetectorcollection.a(i, k, 0).d();
+ blockList.setTypeId(pos.getX(), pos.getY(), pos.getZ(), 0);
+ // CraftBukkit end
}
}
-@@ -62,22 +82,38 @@
+@@ -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);
--
-- 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]);
-- }
++
+ // CraftBukkit start
-+ if (world.addEntity(entityirongolem, SpawnReason.BUILD_IRONGOLEM)) {
++ 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]);
-+ }
-- for (j = 0; j < this.getDetectorIronGolem().c(); ++j) {
-- for (int l = 0; l < this.getDetectorIronGolem().b(); ++l) {
-- ShapeDetectorBlock shapedetectorblock2 = shapedetectorcollection.a(j, l, 0);
-+ for (j = 0; j < this.getDetectorIronGolem().c(); ++j) {
-+ for (int l = 0; l < this.getDetectorIronGolem().b(); ++l) {
-+ ShapeDetectorBlock shapedetectorblock2 = shapedetectorcollection.a(j, l, 0);
-
-- world.update(shapedetectorblock2.d(), Blocks.AIR);
-+ world.update(shapedetectorblock2.d(), Blocks.AIR);
-+ }
+ 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
++ } // CraftBukkit end
}
-+ }
-+ // CraftBukkit start
-+ @Override
-+ public void doPhysics(World world, BlockPosition position, IBlockData data, Block block) {
-+ if (block != null && block.isPowerSource()) {
-+ org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-+ int power = bukkitBlock.getBlockPower();
-+
-+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bukkitBlock, power, power);
-+ world.getServer().getPluginManager().callEvent(eventRedstone);
-+ }
}
-+ // CraftBukkit end
-
- public boolean canPlace(World world, BlockPosition blockposition) {
- return world.getType(blockposition).getBlock().material.isReplaceable() && World.a((IBlockAccess) world, blockposition.down());
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:08:19 +0000