Update Upstream

Spigot-Server-Patches/Optimize-Server-World-Map.patch

@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 000000000..af9e4455c
+index 0000000000..af9e4455c6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +0,0 @@
@@ -217,7 +217,7 @@ index 000000000..af9e4455c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 27af4398c..e6054dddb 100644
+index f04d0530f5..6c12240292 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -236,14 +236,14 @@ index 27af4398c..e6054dddb 100644
 -        for (WorldServer worldserver : this.getWorlds()) {
 +        for (WorldServer worldserver : com.google.common.collect.Lists.newArrayList(this.getWorlds())) { // Paper - avoid como if 1 world triggers another world
              this.loadSpawn(worldserver.getChunkProvider().playerChunkMap.worldLoadListener, worldserver);
+             this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
- 
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         this.sleepForTick();
-         // CraftBukkit start
+         // this.nextTick += 100L;
+         this.executeModerately();
          // Iterator iterator = DimensionManager.a().iterator();
 -
          if (true) {
              DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
-             // CraftBukkit end
+             ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 --