Remove stacktrace on exception from reading server.properties (#9296)

1 files changed, 0 insertions, 35 deletions

diff --git a/patches/server/0904-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0904-Fix-async-entity-add-due-to-fungus-trees.patch
deleted file mode 100644
index fdb8bd16d3..0000000000
--- a/patches/server/0904-Fix-async-entity-add-due-to-fungus-trees.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Fri, 18 Mar 2022 21:30:00 -0700
-Subject: [PATCH] Fix async entity add due to fungus trees
-
-
-diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 52fd12c474c01f3b53d0f6596b7a6fafee52bd0d..877498729c66de9aa6a27c9148f7494d7895615c 100644
---- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-+++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -228,6 +228,7 @@ public class WorldGenRegion implements WorldGenLevel {
-         if (iblockdata.isAir()) {
-             return false;
-         } else {
-+            if (drop) LOGGER.warn("Potential async entity add during worldgen", new Throwable()); // Paper - log when this happens
-             if (false) { // CraftBukkit - SPIGOT-6833: Do not drop during world generation
-                 BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 086cbbfb492413bf1ae901c46f8e8ebbadd68b21..23d77e6cc55c06d9c2cfb21421cd19c487dbe765 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-@@ -401,10 +401,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
-                 ((ChorusFlowerBlock) Blocks.CHORUS_FLOWER).generatePlant(access, pos, random, 8);
-                 return true;
-             case CRIMSON_FUNGUS:
--                gen = TreeFeatures.CRIMSON_FUNGUS_PLANTED;
-+                gen = this.isNormalWorld() ? TreeFeatures.CRIMSON_FUNGUS_PLANTED : TreeFeatures.CRIMSON_FUNGUS; // Paper - if world gen, don't use planted version
-                 break;
-             case WARPED_FUNGUS:
--                gen = TreeFeatures.WARPED_FUNGUS_PLANTED;
-+                gen = this.isNormalWorld() ? TreeFeatures.WARPED_FUNGUS_PLANTED : TreeFeatures.WARPED_FUNGUS; // Paper - if world gen, don't use planted version
-                 break;
-             case AZALEA:
-                 gen = TreeFeatures.AZALEA_TREE;