aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0601-More-Lidded-Block-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0601-More-Lidded-Block-API.patch')
-rw-r--r--patches/server/0601-More-Lidded-Block-API.patch79
1 files changed, 79 insertions, 0 deletions
diff --git a/patches/server/0601-More-Lidded-Block-API.patch b/patches/server/0601-More-Lidded-Block-API.patch
new file mode 100644
index 0000000000..e65c6a26cb
--- /dev/null
+++ b/patches/server/0601-More-Lidded-Block-API.patch
@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: LemonCaramel <[email protected]>
+Date: Sun, 23 May 2021 17:49:51 +0900
+Subject: [PATCH] More Lidded Block API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
+index 08a84f66478d765080367a1c1acd77908ce605a8..7a09fde1a6fbd460548b43ff52301c51d8f5afbc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
+@@ -67,4 +67,11 @@ public class CraftBarrel extends CraftLootable<BarrelBlockEntity> implements Bar
+ public CraftBarrel copy() {
+ return new CraftBarrel(this);
+ }
++
++ // Paper start - More Lidded Block API
++ @Override
++ public boolean isOpen() {
++ return getTileEntity().openersCounter.opened;
++ }
++ // Paper end - More Lidded Block API
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
+index b742d9d231bf79ed53d3fe4deaa81e64c6801c4c..b5d9e750965b21c27ec4aa12b0997176adbad527 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
+@@ -87,4 +87,11 @@ public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest
+ public CraftChest copy() {
+ return new CraftChest(this);
+ }
++
++ // Paper start - More Lidded Block API
++ @Override
++ public boolean isOpen() {
++ return getTileEntity().openersCounter.opened;
++ }
++ // Paper end - More Lidded Block API
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
+index 79fafa30e4f09dc375cc3fcb1d95a9ab6c8fb9f4..872a579460ebe8d6085188a6be9c9eb9b8d4bfa2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
+@@ -45,4 +45,11 @@ public class CraftEnderChest extends CraftBlockEntityState<EnderChestBlockEntity
+ public CraftEnderChest copy() {
+ return new CraftEnderChest(this);
+ }
++
++ // Paper start - More Lidded Block API
++ @Override
++ public boolean isOpen() {
++ return getTileEntity().openersCounter.opened;
++ }
++ // Paper end - More Lidded Block API
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
+index e9c72d58596c528909bbfbccb97b85d36aca7703..3ccab14646c385b10dd310e2f7640fd2249f5371 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
+@@ -59,7 +59,7 @@ public class CraftShulkerBox extends CraftLootable<ShulkerBoxBlockEntity> implem
+ if (this.getTileEntity().opened && this.getWorldHandle() instanceof net.minecraft.world.level.Level) {
+ net.minecraft.world.level.Level world = this.getTileEntity().getLevel();
+ world.blockEvent(this.getPosition(), this.getTileEntity().getBlockState().getBlock(), 1, 0);
+- world.playSound(null, this.getPosition(), SoundEvents.SHULKER_BOX_OPEN, SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F);
++ world.playSound(null, this.getPosition(), SoundEvents.SHULKER_BOX_CLOSE, SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F); // Paper - More Lidded Block API (Wrong sound)
+ }
+ this.getTileEntity().opened = false;
+ }
+@@ -68,4 +68,11 @@ public class CraftShulkerBox extends CraftLootable<ShulkerBoxBlockEntity> implem
+ public CraftShulkerBox copy() {
+ return new CraftShulkerBox(this);
+ }
++
++ // Paper start - More Lidded Block API
++ @Override
++ public boolean isOpen() {
++ return getTileEntity().opened;
++ }
++ // Paper end - More Lidded Block API
+ }