mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-18 05:43:49 -07:00
Update to Minecraft 1.14-pre5
This commit is contained in:
@@ -11,8 +11,8 @@
|
||||
+
|
||||
public abstract class BlockButtonAbstract extends BlockAttachable {
|
||||
|
||||
public static final BlockStateBoolean POWERED = BlockProperties.t;
|
||||
@@ -72,6 +77,19 @@
|
||||
public static final BlockStateBoolean POWERED = BlockProperties.w;
|
||||
@@ -71,6 +76,19 @@
|
||||
if ((Boolean) iblockdata.get(BlockButtonAbstract.POWERED)) {
|
||||
return true;
|
||||
} else {
|
||||
@@ -31,10 +31,10 @@
|
||||
+ // CraftBukkit end
|
||||
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockButtonAbstract.POWERED, true), 3);
|
||||
this.a(entityhuman, world, blockposition, true);
|
||||
this.c(iblockdata, world, blockposition);
|
||||
@@ -113,6 +131,16 @@
|
||||
if (this.E) {
|
||||
this.b(iblockdata, world, blockposition);
|
||||
this.e(iblockdata, world, blockposition);
|
||||
@@ -117,6 +135,16 @@
|
||||
if (this.D) {
|
||||
this.d(iblockdata, world, blockposition);
|
||||
} else {
|
||||
+ // CraftBukkit start
|
||||
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||
@@ -47,9 +47,9 @@
|
||||
+ }
|
||||
+ // CraftBukkit end
|
||||
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockButtonAbstract.POWERED, false), 3);
|
||||
this.c(iblockdata, world, blockposition);
|
||||
this.e(iblockdata, world, blockposition);
|
||||
this.a((EntityHuman) null, world, blockposition, false);
|
||||
@@ -132,7 +160,44 @@
|
||||
@@ -137,7 +165,44 @@
|
||||
boolean flag = !list.isEmpty();
|
||||
boolean flag1 = (Boolean) iblockdata.get(BlockButtonAbstract.POWERED);
|
||||
|
||||
@@ -92,5 +92,5 @@
|
||||
+ }
|
||||
+ // CraftBukkit end
|
||||
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockButtonAbstract.POWERED, flag), 3);
|
||||
this.c(iblockdata, world, blockposition);
|
||||
this.e(iblockdata, world, blockposition);
|
||||
this.a((EntityHuman) null, world, blockposition, flag);
|
||||
|
Reference in New Issue
Block a user