#660: Add support to change block's lid state

By: jameslfc19 <jameslfc19@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2020-07-29 19:41:00 +10:00
parent a9f92a7086
commit c555653b93
6 changed files with 165 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/TileEntityBarrel.java
+++ b/net/minecraft/server/TileEntityBarrel.java
@@ -1,7 +1,54 @@
@@ -1,7 +1,55 @@
package net.minecraft.server;
+// CraftBukkit start
@@ -21,6 +21,7 @@
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new ArrayList<>();
+ private int maxStack = MAX_STACK;
+ public boolean opened;
+
+ @Override
+ public List<ItemStack> getContents() {
@@ -55,3 +56,26 @@
private NonNullList<ItemStack> items;
private int b;
@@ -100,7 +148,7 @@
return;
}
- boolean flag = (Boolean) iblockdata.get(BlockBarrel.b);
+ boolean flag = (Boolean) iblockdata.get(BlockBarrel.b) && !opened; // CraftBukkit - only set flag if Barrel isn't set open by API.
if (flag) {
this.a(iblockdata, SoundEffects.BLOCK_BARREL_CLOSE);
@@ -118,11 +166,11 @@
}
- private void a(IBlockData iblockdata, boolean flag) {
+ public void a(IBlockData iblockdata, boolean flag) { // PAIL private -> public, rename setFlag
this.world.setTypeAndData(this.getPosition(), (IBlockData) iblockdata.set(BlockBarrel.b, flag), 3);
}
- private void a(IBlockData iblockdata, SoundEffect soundeffect) {
+ public void a(IBlockData iblockdata, SoundEffect soundeffect) { // PAIL private -> public, rename playSound
BaseBlockPosition baseblockposition = ((EnumDirection) iblockdata.get(BlockBarrel.a)).p();
double d0 = (double) this.position.getX() + 0.5D + (double) baseblockposition.getX() / 2.0D;
double d1 = (double) this.position.getY() + 0.5D + (double) baseblockposition.getY() / 2.0D;