2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-06-15 02:59:31 +00:00
|
|
|
index 61125c1c1a6efbb3ba13a29d5e4e6bbe67df8a4e..8484e80a70129fb0358d56efab6fd54798b54e6e 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
|
2021-06-15 02:59:31 +00:00
|
|
|
@@ -135,6 +135,11 @@ public class BeehiveBlockEntity extends BlockEntity {
|
2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-08-25 07:59:26 +00:00
|
|
|
index bf51c9e4fd5a5c19eef8572794ecc17157eb7767..5a0b6640de0e95bfe48ababeed4115240d205ddd 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
|
2021-08-25 07:59:26 +00:00
|
|
|
@@ -85,4 +85,10 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
getSnapshot().addOccupant(((CraftBee) entity).getHandle(), false);
|
|
|
|
}
|
|
|
|
+ // Paper start - Add EntityBlockStorage clearEntities
|
|
|
|
+ @Override
|
|
|
|
+ public void clearEntities() {
|
|
|
|
+ getSnapshot().clearBees();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|