Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
821ce25d9 Significantly improve performance of the end generation
2b2e4fd65 Add Wandering Trader spawn rate config options
7263cbca7 [CI-SKIP] [Auto] Rebuild Patches
1c63aff6d Villager resetOffers API
8d8d74a5f Patch 2 references an invalid variable
e6d7bdca1 [CI-SKIP] fixed sed -i for bsd sed (#4782)
7ae47d4eb [CI-SKIP] Remove Waving banner fix (#4786)
82792f883 [Auto] Updated Upstream (CraftBukkit)

patches/server/0005-Tuinity-Server-Config.patch

@@ -286,7 +286,7 @@ index 1e58d039bcca5cf5b20bbb775d1f64c797001454..583f26af9c15d63addcd5657a0624ea9
                  org.spigotmc.WatchdogThread.hasStarted = true; // Paper
                  Arrays.fill( recentTps, 20 );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f260da1fd253ebd233d741809acf8a020779744b..2f55d81c1e6ff5ec8083d9110ed3d2346b8c2662 100644
+index 9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8..389c22a59d8dcb307858bb2fbcf29d88c815e396 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -300,7 +300,7 @@ index f260da1fd253ebd233d741809acf8a020779744b..2f55d81c1e6ff5ec8083d9110ed3d234
      private org.spigotmc.TickLimiter entityLimiter;
 @@ -125,6 +127,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((WorldDataServer) worlddatamutable).getName()); // Spigot
-         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.spigotConfig); // Paper
+         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
 +        this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
          this.generator = gen;

patches/server/0008-Add-soft-async-catcher.patch

@@ -328,7 +328,7 @@ index 126ea76096375708e1b79dc497c89172371cdf51..49833d290e8533a93e03d805cf012bbf
 
          this.noTickViewDistance = viewDistance;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2f55d81c1e6ff5ec8083d9110ed3d2346b8c2662..9cd3ceebfdeb9887a8c3379102cf8b76a8138fed 100644
+index 389c22a59d8dcb307858bb2fbcf29d88c815e396..5c4a70461324e4a5abafc79f2cb68d7fa80f8981 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -363,6 +363,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0015-Execute-chunk-tasks-mid-tick.patch

@@ -267,7 +267,7 @@ index 583f26af9c15d63addcd5657a0624ea926acc424..9846fb912cb421d0bcc79a3f63fdb5cf
                  // Spigot Start
                  CrashReport crashreport;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9cd3ceebfdeb9887a8c3379102cf8b76a8138fed..1748b6e51bb7dad5049613376c36fae9b2f211d2 100644
+index 5c4a70461324e4a5abafc79f2cb68d7fa80f8981..f61f6e21096d36dfd55460cd5580b257c2c63aba 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -898,6 +898,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0021-Optimise-entity-hard-collision-checking.patch

@@ -191,7 +191,7 @@ index 07dbdd560909c8ef64740d82f02bae3d67119ab9..70cb1d89ec587c4e6c770cf14f4bea7a
      }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1748b6e51bb7dad5049613376c36fae9b2f211d2..a2990ad9d2af640b37dbb882576e71a475a53f0b 100644
+index f61f6e21096d36dfd55460cd5580b257c2c63aba..0cec0c483aeb551a7be58b3e765aac491aeed5fc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1082,6 +1082,35 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0025-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch

@@ -1207,7 +1207,7 @@ index 9f4f9df09968dc45878ad59f5ee45672a3f08fbd..db735e29d427cc8f4bd4ba54c7a44daf
 
      @VisibleForTesting
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a2990ad9d2af640b37dbb882576e71a475a53f0b..af514cdc26b839caf8885f564f8d18af7ca91aed 100644
+index 0cec0c483aeb551a7be58b3e765aac491aeed5fc..e10d0e5d060002daf85dd6d2a5d46422e82b2ef7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1113,8 +1113,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0046-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch

@@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index af514cdc26b839caf8885f564f8d18af7ca91aed..f9014d3c60a49d162750109fb50d8bf2ed830c7a 100644
+index e10d0e5d060002daf85dd6d2a5d46422e82b2ef7..a4ba6be2b9dfc164379f561c6d7b36da4cf08242 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -289,6 +289,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0049-Optimise-closest-entity-lookup-used-by-AI-goals.patch

@@ -324,7 +324,7 @@ index 253377c6238594de1f76cafcbf8223592e4d3f6b..3ebe3d0dc4c2c6aee6ea349006a74cbe
          if (entityliving == entityliving1) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f9014d3c60a49d162750109fb50d8bf2ed830c7a..c317fdb45bae859efbb33a39d4eb086f7c00abc5 100644
+index a4ba6be2b9dfc164379f561c6d7b36da4cf08242..e12bad3aaa2f9912330d2a1f68ffc590ed1431af 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1184,7 +1184,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0050-Optimise-EntityInsentient-checkDespawn.patch

@@ -203,7 +203,7 @@ index 630274a6e0dec83339ac03f25ebc0246ccd3df1e..2a8455b813853693e20f368d3ece78d9
      // Paper start - Chunk Prioritization
      public void queueHolderUpdate(PlayerChunk playerchunk) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c317fdb45bae859efbb33a39d4eb086f7c00abc5..6cb47160d57bc9cf513e7edb40a43bb95c5133f7 100644
+index e12bad3aaa2f9912330d2a1f68ffc590ed1431af..59abca0fd2330e1cdeda603d4146e4bb1afc3090 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -123,6 +123,34 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -240,7 +240,7 @@ index c317fdb45bae859efbb33a39d4eb086f7c00abc5..6cb47160d57bc9cf513e7edb40a43bb9
 +
      protected World(WorldDataMutable worlddatamutable, ResourceKey<World> resourcekey, final DimensionManager dimensionmanager, Supplier<GameProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((WorldDataServer) worlddatamutable).getName()); // Spigot
-         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.spigotConfig); // Paper
+         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((WorldDataServer) worlddatamutable).getName(), this.spigotConfig); // Paper
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
 index e9504241fcea63463bca1e7b6b7cabc0a6a4d375..2f4110311244daed64f4ffbd331692282c212344 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java