38 lines
1.8 KiB
Diff
38 lines
1.8 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 cbd0587eeecf14b1914bdb33f7a4584bd6b5c8d0..83e5367ee1126afe31e9f704a0daedd310339d15 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
|
||
|
|
@@ -120,6 +120,11 @@ public class BeehiveBlockEntity extends BlockEntity implements TickableBlockEnti
|
||
|
|
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 e61ea9c7fb711e8335a5d0fd5a8bc0152a225038..3346a1962a992566fe840fd0a75cfa06f694833a 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
|
||
|
|
@@ -83,4 +83,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
|
||
|
|
}
|