37 lines
1.7 KiB
Diff
37 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
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 e4e879cdfe7d257161bf8e98305c0f2e9b9539f9..19127ec5d89235ea9af549810b24783e0af85a3d 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
|
|
@@ -138,6 +138,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 ee4d7f5558ed76e8d8b56133da729a5303d1d823..e00210950cbf005b0e65aed68dfbb7c281aefd87 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
|
|
@@ -80,4 +80,10 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
|
|
|
|
getSnapshot().addOccupant(((CraftBee) entity).getHandle(), false);
|
|
}
|
|
+ // Paper start - Add EntityBlockStorage clearEntities
|
|
+ @Override
|
|
+ public void clearEntities() {
|
|
+ getSnapshot().clearBees();
|
|
+ }
|
|
+ // Paper end
|
|
}
|