2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/BlockPiston.java
|
|
|
|
+++ b/net/minecraft/server/BlockPiston.java
|
2016-05-10 13:47:39 +02:00
|
|
|
@@ -5,6 +5,18 @@
|
2015-02-26 23:41:06 +01:00
|
|
|
import java.util.List;
|
2016-05-10 13:47:39 +02:00
|
|
|
import javax.annotation.Nullable;
|
2015-02-26 23:41:06 +01:00
|
|
|
|
|
|
|
+// CraftBukkit start
|
2014-11-25 22:32:16 +01:00
|
|
|
+import java.util.AbstractList;
|
|
|
|
+import java.util.Collection;
|
|
|
|
+import java.util.Iterator;
|
|
|
|
+import java.util.ListIterator;
|
|
|
|
+
|
2015-01-20 00:27:40 +01:00
|
|
|
+import com.google.common.collect.ImmutableList;
|
2014-11-25 22:32:16 +01:00
|
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
|
|
+import org.bukkit.event.block.BlockPistonRetractEvent;
|
|
|
|
+import org.bukkit.event.block.BlockPistonExtendEvent;
|
|
|
|
+// CraftBukkit end
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2016-02-29 22:32:46 +01:00
|
|
|
public class BlockPiston extends BlockDirectional {
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2016-02-29 22:32:46 +01:00
|
|
|
public static final BlockStateBoolean EXTENDED = BlockStateBoolean.of("extended");
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -103,6 +115,18 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
world.playBlockAction(blockposition, this, 0, enumdirection.a());
|
|
|
|
}
|
|
|
|
} else if (!flag && ((Boolean) iblockdata.get(BlockPiston.EXTENDED)).booleanValue()) {
|
|
|
|
+ // CraftBukkit start
|
2015-07-30 08:56:52 +02:00
|
|
|
+ if (!this.sticky) {
|
2015-01-20 00:27:40 +01:00
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+ BlockPistonRetractEvent event = new BlockPistonRetractEvent(block, ImmutableList.<org.bukkit.block.Block>of(), CraftBlock.notchToBlockFace(enumdirection));
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
2015-01-20 00:27:40 +01:00
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+ }
|
2016-02-29 22:32:46 +01:00
|
|
|
+ // PAIL: checkME - what happened to setTypeAndData?
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit end
|
|
|
|
world.playBlockAction(blockposition, this, 1, enumdirection.a());
|
|
|
|
}
|
2016-02-29 22:32:46 +01:00
|
|
|
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -193,7 +217,7 @@
|
2015-01-20 00:27:40 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-17 02:41:03 +01:00
|
|
|
- if (!flag1 && iblockdata1.getMaterial() != Material.AIR && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false) && (iblockdata1.p() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) {
|
|
|
|
+ if (!flag1 && a(iblockdata1, world, blockposition1, enumdirection.opposite(), false) && (iblockdata1.p() == EnumPistonReaction.NORMAL || block == Blocks.PISTON || block == Blocks.STICKY_PISTON)) { // CraftBukkit - remove 'block.getMaterial() != Material.AIR' condition
|
2015-01-20 00:27:40 +01:00
|
|
|
this.a(world, blockposition, enumdirection, false);
|
|
|
|
}
|
|
|
|
} else {
|
2016-11-17 02:41:03 +01:00
|
|
|
@@ -274,6 +298,48 @@
|
2016-02-29 22:32:46 +01:00
|
|
|
int j = list.size() + list1.size();
|
|
|
|
IBlockData[] aiblockdata = new IBlockData[j];
|
|
|
|
EnumDirection enumdirection1 = flag ? enumdirection : enumdirection.opposite();
|
2015-01-20 00:27:40 +01:00
|
|
|
+ // CraftBukkit start
|
2014-11-25 22:32:16 +01:00
|
|
|
+ final org.bukkit.block.Block bblock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+
|
2015-03-09 23:34:05 +01:00
|
|
|
+ final List<BlockPosition> moved = pistonextendschecker.getMovedBlocks();
|
|
|
|
+ final List<BlockPosition> broken = pistonextendschecker.getBrokenBlocks();
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
|
|
|
+ List<org.bukkit.block.Block> blocks = new AbstractList<org.bukkit.block.Block>() {
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int size() {
|
|
|
|
+ return moved.size() + broken.size();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public org.bukkit.block.Block get(int index) {
|
|
|
|
+ if (index >= size() || index < 0) {
|
|
|
|
+ throw new ArrayIndexOutOfBoundsException(index);
|
|
|
|
+ }
|
|
|
|
+ BlockPosition pos = (BlockPosition) (index < moved.size() ? moved.get(index) : broken.get(index - moved.size()));
|
|
|
|
+ return bblock.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
|
|
|
|
+ }
|
|
|
|
+ };
|
2015-01-20 00:27:40 +01:00
|
|
|
+ org.bukkit.event.block.BlockPistonEvent event;
|
|
|
|
+ if (flag) {
|
|
|
|
+ event = new BlockPistonExtendEvent(bblock, blocks, CraftBlock.notchToBlockFace(enumdirection1));
|
|
|
|
+ } else {
|
|
|
|
+ event = new BlockPistonRetractEvent(bblock, blocks, CraftBlock.notchToBlockFace(enumdirection1));
|
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
|
|
+
|
|
|
|
+ if (event.isCancelled()) {
|
2015-03-09 23:34:05 +01:00
|
|
|
+ for (BlockPosition b : broken) {
|
2016-02-29 22:32:46 +01:00
|
|
|
+ world.notify(b, Blocks.AIR.getBlockData(), world.getType(b), 3);
|
2015-03-09 23:34:05 +01:00
|
|
|
+ }
|
|
|
|
+ for (BlockPosition b : moved) {
|
2016-02-29 22:32:46 +01:00
|
|
|
+ world.notify(b, Blocks.AIR.getBlockData(), world.getType(b), 3);
|
|
|
|
+ b = b.shift(enumdirection1);
|
|
|
|
+ world.notify(b, Blocks.AIR.getBlockData(), world.getType(b), 3);
|
2015-03-09 23:34:05 +01:00
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2014-12-05 16:11:22 +01:00
|
|
|
|
2016-02-29 22:32:46 +01:00
|
|
|
int k;
|
|
|
|
BlockPosition blockposition2;
|