aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0533-More-Lidded-Block-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0533-More-Lidded-Block-API.patch')
-rw-r--r--patches/server/0533-More-Lidded-Block-API.patch79
1 files changed, 79 insertions, 0 deletions
diff --git a/patches/server/0533-More-Lidded-Block-API.patch b/patches/server/0533-More-Lidded-Block-API.patch
new file mode 100644
index 0000000000..437434c525
--- /dev/null
+++ b/patches/server/0533-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 f4b480e3041fc79060c5fa6ce517047104b280d5..6063f0e1fdc232d063105971359ae688168a2bc4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
+@@ -73,4 +73,11 @@ public class CraftBarrel extends CraftLootable<BarrelBlockEntity> implements Bar
+ public CraftBarrel copy(Location location) {
+ return new CraftBarrel(this, location);
+ }
++
++ // 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 2b6a93a944b27290745278957a3577772b7b8212..6e98a00d526b734992ce39b15768c5820dce4ca8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
+@@ -92,4 +92,11 @@ public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest
+ public CraftChest copy(Location location) {
+ return new CraftChest(this, location);
+ }
++
++ // 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 07b63ce5f5e152f6a644134989ffa03af8a12cdf..b64adbba3e52d32d439e64a243cb74f3fbca2ce3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
+@@ -51,4 +51,11 @@ public class CraftEnderChest extends CraftBlockEntityState<EnderChestBlockEntity
+ public CraftEnderChest copy(Location location) {
+ return new CraftEnderChest(this, location);
+ }
++
++ // 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 7676313493bcb6327c2a9c026645fe060733c6ac..f7b199fbc7a740de3ee6952ce12ef2c35f057d7a 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;
+ }
+@@ -73,4 +73,11 @@ public class CraftShulkerBox extends CraftLootable<ShulkerBoxBlockEntity> implem
+ public CraftShulkerBox copy(Location location) {
+ return new CraftShulkerBox(this, location);
+ }
++
++ // Paper start - More Lidded Block API
++ @Override
++ public boolean isOpen() {
++ return getTileEntity().opened;
++ }
++ // Paper end - More Lidded Block API
+ }