aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0589-Add-EntityBlockStorage-clearEntities.patch')
-rw-r--r--patches/server/0589-Add-EntityBlockStorage-clearEntities.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
new file mode 100644
index 0000000000..0488f4f727
--- /dev/null
+++ b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Mon, 5 Apr 2021 18:12:29 -0400
+Subject: [PATCH] Add EntityBlockStorage#clearEntities()
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+index 5c89d824ef43792c34c9f2df5851ba8af503cbd9..9d4152f9fde93a832f263c793955d327f1e078f7 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+@@ -139,6 +139,11 @@ public class BeehiveBlockEntity extends BlockEntity {
+ return this.stored.size();
+ }
+
++ // Paper start - Add EntityBlockStorage clearEntities
++ public void clearBees() {
++ this.stored.clear();
++ }
++ // Paper end
+ public static int getHoneyLevel(BlockState state) {
+ return (Integer) state.getValue(BeehiveBlock.HONEY_LEVEL);
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
+index 54fd63a9293c9d6a444a184be1dc08e4bd948a10..2e51fab98d95c93d2095f7be6dbb5d5474158bfb 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
+@@ -90,4 +90,11 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
+ public CraftBeehive copy() {
+ return new CraftBeehive(this);
+ }
++
++ // Paper start - Add EntityBlockStorage clearEntities
++ @Override
++ public void clearEntities() {
++ getSnapshot().clearBees();
++ }
++ // Paper end
+ }