Revert "Optimize Persistent Data loading" (Fixes #2229)

Spigot-Server-Patches/0377-Allow-login-events-to-fire-only-after-the-server-plu.patch

@@ -1,4 +1,4 @@
-From ea6d715ab826c8709c7918f7975b7a8c1bcf92a4 Mon Sep 17 00:00:00 2001
+From eeb55c6cb17c46fb9568d4567c364de1ebb86b5c Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are

Spigot-Server-Patches/0378-Make-region-files-more-reliable-to-write-to.patch

@@ -1,4 +1,4 @@
-From b85b6a8d71b7831be7c2044aa4f04e27b95d787d Mon Sep 17 00:00:00 2001
+From 116d5905ed9d29a3b56a123286d9775cd42ba2d5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to
@@ -197,5 +197,5 @@ index ed2ccebb23..2e14d84657 100644
          backup();
          int k = offsets[j1];
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0379-Optimize-GameRules-to-use-LinkedHashMap.patch

@@ -1,4 +1,4 @@
-From 3f8b74941f8e280ccb097d14b258c8aaa3dfecbc Mon Sep 17 00:00:00 2001
+From b52419c24faf5241570e38f711b50e594c200c6c Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap

Spigot-Server-Patches/0380-Optimize-Captured-TileEntity-Lookup.patch

@@ -1,4 +1,4 @@
-From e883942e00955e4a4caa2e8e8f80169d12beb3c0 Mon Sep 17 00:00:00 2001
+From 8f873b091df7d9b60db1f6835806c44b8eab0074 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0f04860bc..a9c5ded5b 100644
+index f1552f23ea..ef080f9571 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1087,12 +1087,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/0381-Add-Heightmap-API.patch

@@ -1,4 +1,4 @@
-From d43430cb8341c10e61d274322abd2f2bf2f7e232 Mon Sep 17 00:00:00 2001
+From 0617854be931d448fd869c0fd4649eca3cb299d2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API

Spigot-Server-Patches/0382-Handle-bad-chunks-more-gracefully.patch

@@ -1,4 +1,4 @@
-From f466694c87deb057b8f216e15ef9ea38f01de9a2 Mon Sep 17 00:00:00 2001
+From 7fce2818f03b124af4ca3607d2221fa6942feeaa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully
@@ -59,5 +59,5 @@ index c53518a477..6f34d8aea0 100644
  
              nbttagcompound = null;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0383-Mob-Spawner-API-Enhancements.patch

@@ -1,4 +1,4 @@
-From 19b0039af57b4e43f2f1926fd0611b231021a67c Mon Sep 17 00:00:00 2001
+From b4eb4e4936e8c5474b3428cd99f20c40c3cacd78 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements

Spigot-Server-Patches/0384-Per-Player-View-Distance-API-placeholders.patch

@@ -1,4 +1,4 @@
-From 3816c9b43becef24731f8e19139f89fca0eac1b3 Mon Sep 17 00:00:00 2001
+From 02027238ab11adbe72988a97d6f130f0c0e16d83 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders

Spigot-Server-Patches/0385-Async-Chunk-placeholder.patch

@@ -1,4 +1,4 @@
-From 7e082ac626aa32df744ce2af177a0a497ee39d27 Mon Sep 17 00:00:00 2001
+From ddd7bddce04baf2f9e368a655b9984cb5b4ab65d Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 6 May 2019 12:29:24 -0700
 Subject: [PATCH] Async Chunk placeholder

Spigot-Server-Patches/0386-Fix-CB-call-to-changed-postToMainThread-method.patch

@@ -1,11 +1,11 @@
-From 777435ba526984c7880a92d1a44bed52ac4ef1c9 Mon Sep 17 00:00:00 2001
+From 4d9037edbe6801f6f390bfd221e503404bcfd1b0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4e8b8f49c4..a0b644801a 100644
+index dda8196702..6d6e50313e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -18,5 +18,5 @@ index 4e8b8f49c4..a0b644801a 100644
  
      @Override
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0387-Fix-sounds-when-item-frames-are-modified-MC-123450.patch

@@ -1,4 +1,4 @@
-From 8b27ce823a13772a097c67a159c8484e62b8684c Mon Sep 17 00:00:00 2001
+From c01c3272a155b1f2230b7ebdbcb28b638b1b66a2 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 3ecdd00a12..aac28bfa32 100644
+index 9eaf57d2c9..50ca7b9d26 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 3ecdd00a12..aac28bfa32 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 70127520a2..712ec431f0 100644
+index 799036f268..9ad180d946 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@@ -32,5 +32,5 @@ index 70127520a2..712ec431f0 100644
          this.entity = frame;
      }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0388-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch

@@ -1,4 +1,4 @@
-From 5dfb31ff51f6a38b8deff07e7ec50e461d10b6fb Mon Sep 17 00:00:00 2001
+From 32405aae871c645e3bf32a91d543e11939ca5670 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer

Spigot-Server-Patches/0389-Elide-lock-in-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 51fd7997bca218ef386063113130b7108f779682 Mon Sep 17 00:00:00 2001
+From 957af026b82e6d162fab7366a73ff1903765ad30 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 May 2019 08:19:27 -0700
 Subject: [PATCH] Elide lock in DataWatcher
@@ -136,5 +136,5 @@ index f224043d8e..bbea8ef726 100644
  
      public static class Item<T> {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0390-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From 7093fa789544512bc6cc86996500cd8baccbb414 Mon Sep 17 00:00:00 2001
+From 2ae762722dcd0a51c29be0c8e2f03bdeed1f954e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks

Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From e511474d4f117352b964bbc3f9c2d033a822853a Mon Sep 17 00:00:00 2001
+From 943c29a529c68835040dbfd9873404794c6ee1f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option

Spigot-Server-Patches/0392-improve-CraftWorld-isChunkLoaded.patch

@@ -1,4 +1,4 @@
-From 4c1d1a6ace5eefae40ce157e50eefd6cb3ca32b5 Mon Sep 17 00:00:00 2001
+From bd24bc43e9c308690d278c4a73ac6b85526e7e94 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded

Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From e7eb619ad88e384daf7e6b792d59c6ea96daa297 Mon Sep 17 00:00:00 2001
+From 884a33c2405b7e77c5da84c21497c7e431f85588 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world

Spigot-Server-Patches/0394-Fix-some-generation-concurrency-issues.patch

@@ -1,4 +1,4 @@
-From 031b39277a43845b48f0606be228b9f6609a7d86 Mon Sep 17 00:00:00 2001
+From 6f4479dbad5aa869ef6f46e2e17b722a1b780718 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
@@ -18,7 +18,7 @@ index 6aa0ca3959..ed9b5c63f0 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 78bae25255..1defbd9747 100644
+index 0acdb527d9..a7a35d6a6f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -101,6 +101,23 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -209,5 +209,5 @@ index eca27e52e9..fb3463fcce 100644
      }
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0395-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch

@@ -1,4 +1,4 @@
-From 74a90e209f5e47e996f4f6441a873acbadebfd10 Mon Sep 17 00:00:00 2001
+From 60f4e8b4c5cd2276462973d309330d6a903114a4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
@@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
-index 418c638d3..315ba7a22 100644
+index 70c2820463..8bbbe8505f 100644
 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 @@ -163,6 +163,12 @@ public class EntityAreaEffectCloud extends Entity {
@@ -23,5 +23,5 @@ index 418c638d3..315ba7a22 100644
          if (this.world.isClientSide) {
              ParticleParam particleparam = this.getParticle();
 -- 
-2.20.1
+2.22.0
 

Spigot-Server-Patches/0396-ChunkMapDistance-CME.patch

@@ -1,4 +1,4 @@
-From 9026648cfccaa3e7fc3867774c0ad1fbf56f5de1 Mon Sep 17 00:00:00 2001
+From 80ad0034e5f2a575baacc12b988f8beb51a5d4ba Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME

Spigot-Server-Patches/0397-Actually-Limit-Natural-Spawns-To-Limit.patch

@@ -1,4 +1,4 @@
-From e62f02e098120bd54c0eeeefb9e153e70b428ef3 Mon Sep 17 00:00:00 2001
+From e4d85a99c9962df1e8894e4dbc5f3a9c69dc2646 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Sun, 2 Jun 2019 01:22:02 -0400
 Subject: [PATCH] Actually-Limit-Natural-Spawns-To-Limit

Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch

@@ -1,4 +1,4 @@
-From cc4feaf72114fabe4037414d33ed88121133e819 Mon Sep 17 00:00:00 2001
+From 8fd5fc42f1bbc2be9e6bc5c8780fec111a9558ef Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup

Spigot-Server-Patches/0399-Chunk-debug-command.patch

@@ -1,4 +1,4 @@
-From 8bdf16a1e8e2f90f430797eea471e538c21f8e09 Mon Sep 17 00:00:00 2001
+From 9705f0ddcff34e0463203c2348481f714c9cd650 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Jun 2019 13:00:55 -0700
 Subject: [PATCH] Chunk debug command

Spigot-Server-Patches/0400-incremental-chunk-saving.patch

@@ -1,4 +1,4 @@
-From e5b657f6a3940622223dde4160f3e80066eba540 Mon Sep 17 00:00:00 2001
+From fe90f3351f14e18c2f52fd111ca191e0d3b14940 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving

Spigot-Server-Patches/0401-Catch-exceptions-from-dispenser-entity-spawns.patch

@@ -1,4 +1,4 @@
-From 4e86aa51295c1ba141e82ac79407c460ea1dfc19 Mon Sep 17 00:00:00 2001
+From d5d42eb2d3052b8b9a7f68d7d5da09ee600c3606 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 10 Jun 2019 09:36:40 +0100
 Subject: [PATCH] Catch exceptions from dispenser entity spawns
@@ -24,5 +24,5 @@ index 60442e4b8a..1874b5d252 100644
                  // CraftBukkit end
                  return itemstack;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0402-Fix-World-isChunkGenerated-calls.patch

@@ -1,4 +1,4 @@
-From b7ab62b17e1d6a232c8a792e16f26537e6abf4fc Mon Sep 17 00:00:00 2001
+From 36177cdd8e155472e050b34c132841485abe31a8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls

Spigot-Server-Patches/0403-Show-blockstate-location-if-we-failed-to-read-it.patch

@@ -1,11 +1,11 @@
-From 69cdbe91b7cd74fedd4c1cb6eb5d405dca1deaca Mon Sep 17 00:00:00 2001
+From 8313014b2fa3ce58ec2100c96d600e07b061acc6 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 10:28:25 -0700
 Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 7cb4c3e503..a593882988 100644
+index 7cb4c3e503..44e0556277 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -20,6 +20,8 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -33,5 +33,5 @@ index 7cb4c3e503..a593882988 100644
  
      public final boolean snapshotDisabled; // Paper
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0404-Fix-MC-154214.patch

@@ -1,4 +1,4 @@
-From 09f840156671701b31ae0d7f3c9d8cf45146040e Mon Sep 17 00:00:00 2001
+From c4fafcc6d9f1697387135360d4ea453eb0fcd70f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 16 Jun 2019 23:30:25 -0700
 Subject: [PATCH] Fix MC-154214

Spigot-Server-Patches/0405-Log-other-thread-in-DataPaletteBlock-lock-failure.patch

@@ -1,4 +1,4 @@
-From c4372f568bac5150931a17bb1c78b32f9a9bdd31 Mon Sep 17 00:00:00 2001
+From 092eb3f6427db8ae080883136eb16ecc510ed9d7 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 21 Jun 2019 14:42:48 -0700
 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
@@ -47,5 +47,5 @@ index 28a6be7ab0..e05b9d606a 100644
  
              crashreportsystemdetails.a("Thread dumps", (Object) s);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0406-Use-ChunkStatus-cache-when-saving-protochunks.patch

@@ -1,4 +1,4 @@
-From 3194cf4e96fa8e3fc8c3be972e3a78307052246b Mon Sep 17 00:00:00 2001
+From 29d327049da018e9c3b4cb5b001582e8fdbd8259 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 22 Jun 2019 04:20:47 -0700
 Subject: [PATCH] Use ChunkStatus cache when saving protochunks

Spigot-Server-Patches/0407-Fix-tracker-desync-issue.patch

@@ -1,4 +1,4 @@
-From e7c186d6eb5076f46ddf595ac0249ee937e25d02 Mon Sep 17 00:00:00 2001
+From 3944ba91d8551e8ca5d4f0ec0a675107d3e08aca Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 23 Jun 2019 19:11:27 -0700
 Subject: [PATCH] Fix tracker desync issue