diff options
author | md_5 <git@md-5.net> | 2015-07-30 16:56:52 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2015-07-30 17:13:35 +1000 |
commit | 9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e (patch) | |
tree | 419daa22a7b957617c86aae6a4d26098f2157995 /nms-patches/BlockPumpkin.patch | |
parent | de5c26123fcb6294e77ec916d91635c3f18982ee (diff) | |
download | craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.gz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.lz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.xz craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.zip |
Update for minor remapping changes.
Diffstat (limited to 'nms-patches/BlockPumpkin.patch')
-rw-r--r-- | nms-patches/BlockPumpkin.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/BlockPumpkin.patch b/nms-patches/BlockPumpkin.patch index dd056887..224b1e9d 100644 --- a/nms-patches/BlockPumpkin.patch +++ b/nms-patches/BlockPumpkin.patch @@ -21,16 +21,16 @@ for (i = 0; i < this.getDetectorSnowGolem().b(); ++i) { ShapeDetectorBlock shapedetectorblock = shapedetector_shapedetectorcollection.a(0, i, 0); -- world.setTypeAndData(shapedetectorblock.d(), Blocks.AIR.getBlockData(), 2); +- world.setTypeAndData(shapedetectorblock.getPosition(), Blocks.AIR.getBlockData(), 2); + // CraftBukkit start + // world.setTypeAndData(shapedetectorblock.d(), Blocks.AIR.getBlockData(), 2); -+ BlockPosition pos = shapedetectorblock.d(); ++ 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).d(); + 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); @@ -42,17 +42,17 @@ 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.getPosition(), 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); +- world.setTypeAndData(shapedetector_shapedetectorcollection.a(i, k, 0).getPosition(), 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(); ++ BlockPosition pos = shapedetector_shapedetectorcollection.a(i, k, 0).getPosition(); + blockList.setTypeId(pos.getX(), pos.getY(), pos.getZ(), 0); + // CraftBukkit end } @@ -71,7 +71,7 @@ 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); + world.update(shapedetectorblock2.getPosition(), Blocks.AIR); } } + } // CraftBukkit end |