From 0d530ef31fe0dabf27cd21bec30c11f7a9c39336 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 10 Dec 2023 17:00:20 -0600 Subject: [PATCH] Add a few more --- ...og-spam-caused-by-invalid-entities-in-beehive.patch | 10 +++++----- .../0005-Removes-useless-spammy-error-logging.patch | 8 ++++---- ...errors-thrown-when-trying-to-remove-minecart-.patch | 0 3 files changed, 9 insertions(+), 9 deletions(-) rename patches/{unapplied => }/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch (82%) rename patches/{unapplied => }/server/0005-Removes-useless-spammy-error-logging.patch (78%) rename patches/{unapplied => }/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch (100%) diff --git a/patches/unapplied/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 similarity index 82% rename from patches/unapplied/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch rename to patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch index dc1a5a1..fad4cb7 100644 --- a/patches/unapplied/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 @@ -1,18 +1,18 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 13 Mar 2022 06:10:22 -0600 +From: Telesphoreo +Date: Sun, 10 Dec 2023 16:57:48 -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 41c9f074203915c31c1ae7a160ce509c13383f84..8b4989593da43fc2fd661ac66bfe5ae1eb5e2780 100644 +index dfd364ac4b7551a13c4c6c100b5e62c0dfb10595..e0b0dec10dfc5d8e336a4c0f7005e7186f925c1a 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; // Scissors ++import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.tags.BlockTags; @@ -27,6 +27,6 @@ index 41c9f074203915c31c1ae7a160ce509c13383f84..8b4989593da43fc2fd661ac66bfe5ae1 + } + // Scissors end + - BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData"), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks")); + BeehiveBlockEntity.BeeData tileentitybeehive_hivebee = new BeehiveBlockEntity.BeeData(nbttagcompound1.getCompound("EntityData").copy(), nbttagcompound1.getInt("TicksInHive"), nbttagcompound1.getInt("MinOccupationTicks")); this.stored.add(tileentitybeehive_hivebee); diff --git a/patches/unapplied/server/0005-Removes-useless-spammy-error-logging.patch b/patches/server/0005-Removes-useless-spammy-error-logging.patch similarity index 78% rename from patches/unapplied/server/0005-Removes-useless-spammy-error-logging.patch rename to patches/server/0005-Removes-useless-spammy-error-logging.patch index 7a963b9..dd927cb 100644 --- a/patches/unapplied/server/0005-Removes-useless-spammy-error-logging.patch +++ b/patches/server/0005-Removes-useless-spammy-error-logging.patch @@ -1,14 +1,14 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 13 Mar 2022 07:47:20 -0600 +From: Telesphoreo +Date: Sun, 10 Dec 2023 16:58:55 -0600 Subject: [PATCH] Removes useless spammy error logging diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index aeca803cc0434d9de9434987d6e43b70353e305b..5bd581c1a82236359c810037333590d0d9741587 100644 +index ed87722957a0bd5f6348b91ac2ea9bb5ceb6d853..1b5cb36430ea8cb16491c92184051005453ee297 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1814,8 +1814,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1815,8 +1815,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { resource = CraftNamespacedKey.fromMinecraft(key); } } catch (IllegalArgumentException ex) { diff --git a/patches/unapplied/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch b/patches/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch similarity index 100% rename from patches/unapplied/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch rename to patches/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch