From eabbb657660d848ad4ac4663b192a21424e864bd Mon Sep 17 00:00:00 2001 From: Video Date: Sun, 13 Mar 2022 06:12:45 -0600 Subject: [PATCH] Fixes log spam caused by invalid entities in beehives --- ...aused-by-invalid-entities-in-beehive.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch diff --git a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch new file mode 100644 index 0000000..9ac4ef6 --- /dev/null +++ b/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Video +Date: Sun, 13 Mar 2022 06:10:22 -0600 +Subject: [PATCH] Fixes log spam caused by invalid entities in beehives + + +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 8484e80a70129fb0358d56efab6fd54798b54e6e..90fce5d2178672608f3ae97277cafe740a9ebead 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 +@@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag; + import net.minecraft.nbt.ListTag; + import net.minecraft.nbt.NbtUtils; + import net.minecraft.network.protocol.game.DebugPackets; ++import net.minecraft.resources.ResourceLocation; + import net.minecraft.sounds.SoundEvents; + import net.minecraft.sounds.SoundSource; + import net.minecraft.tags.BlockTags; +@@ -351,6 +352,13 @@ public class BeehiveBlockEntity extends BlockEntity { + + for (int i = 0; i < nbttaglist.size(); ++i) { + CompoundTag nbttagcompound1 = nbttaglist.getCompound(i); ++ ++ // Scissors start - Do not allow invalid entities from being used for bees ++ if (!nbttagcompound1.contains("id") || !ResourceLocation.isValidResourceLocation(nbttagcompound1.getString("id")) || EntityType.byString(nbttagcompound1.getString("id")).isEmpty()) { ++ continue; ++ } ++ // Scissor end ++ + BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks")); + + this.stored.add(tileentitybeehive_hivebee);