Update upstream B/CB/S

Spigot-Server-Patches/Add-exception-reporting-event.patch

@@ -89,7 +89,7 @@ index e1fc4ea6c..8f1a68d67 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index f7f2d12cf..b0a82e7ed 100644
+index fab36ec15..0ad57afba 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ import java.util.Iterator;
@@ -198,7 +198,7 @@ index 936d6c640..50056f49a 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index b0279ac3e..be13c1131 100644
+index 8d1b65885..5f9678aad 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@
@@ -225,7 +225,7 @@ index b0279ac3e..be13c1131 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 933934fb6..19fbf9b4a 100644
+index 0163a4e59..57d6443cd 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@

Spigot-Server-Patches/Auto-Save-Improvements.patch

@@ -76,7 +76,7 @@ index 88437d77a..9f7f32dc2 100644
  
      public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0a8e09e5e..ad668be62 100644
+index 81b9bb884..71df9e4aa 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@
@@ -96,7 +96,7 @@ index 0a8e09e5e..ad668be62 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index acda1843d..171ed25c3 100644
+index 4e8efc549..55c966811 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -155,7 +155,7 @@ index 2349c3ade..8134501c7 100644
          this.methodProfiler.a("tallying");
          // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 50a3dfe44..185b5929f 100644
+index 97322c5da..58f30fb1d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {

Spigot-Server-Patches/Auto-fix-bad-Y-levels-on-player-login.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 171ed25c3..32bce920b 100644
+index 55c966811..eca224bdb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/Chunk-Save-Reattempt.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 7f3e874ba..310ab96ab 100644
+index 8e91be4a1..721a3cd81 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -28,7 +28,7 @@ index 7f3e874ba..310ab96ab 100644
                  synchronized (lock) { if (this.b.get(chunkcoordintpair) == nbttagcompound) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index be13c1131..9cfc46bc2 100644
+index 5f9678aad..ed840dbc9 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +0,0 @@ public class RegionFile {

Spigot-Server-Patches/Chunk-Save-Stats-Debug-Option.patch

@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 916bf53f4..7006466b5 100644
+index 0fb1f8427..dabe4137f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,13 +55,13 @@ index 916bf53f4..7006466b5 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 139f2799c..a10964b5b 100644
+index 895882b2e..a4c0b0c96 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+         this.e = dataconvertermanager;
      }
  
-     // CraftBukkit start
 -    public int getQueueSize() { return queue.size(); } // Paper
 +    // Paper start
 +    private long queuedSaves = 0;
@@ -70,9 +70,9 @@ index 139f2799c..a10964b5b 100644
 +    public long getQueuedSaves() { return queuedSaves; }
 +    public long getProcessedSaves() { return processedSaves.longValue(); }
 +    // Paper end
-     public boolean chunkExists(World world, int i, int j) {
-         ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
  
+     // CraftBukkit start - Add async variant, provide compatibility
+     @Nullable
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          synchronized (lock) {  // Paper - Chunk queue improvements
              this.b.put(chunkcoordintpair, nbttagcompound);

Spigot-Server-Patches/Chunk-save-queue-improvements.patch

@@ -41,7 +41,7 @@ index 9a6f87e59..873ffa77d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 79cb3953b..7f3e874ba 100644
+index bee52d783..8e91be4a1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ import java.util.Map;
@@ -63,20 +63,6 @@ index 79cb3953b..7f3e874ba 100644
      private final File d;
      private final DataConverterManager e;
      private boolean f;
-@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-     public boolean chunkExists(World world, int i, int j) {
-         ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
- 
--        if (this.c.contains(chunkcoordintpair)) {
-+        //if (this.c.contains(chunkcoordintpair)) { // Paper - Chunk queue improvements
-             if (this.b.containsKey(chunkcoordintpair)) {
-                 return true;
-             }
--        }
-+        //} // Paper - Chunk queue improvements
- 
-         // Paper start - Don't create region files when checking that they exist
-         final RegionFile region = RegionFileCache.a(this.d, i, j, false);
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  

Spigot-Server-Patches/Configurable-Player-Collision.patch

@@ -75,7 +75,7 @@ index d8ec50455..eb45d3cf2 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b8d48b45c..50a3dfe44 100644
+index e303b45f0..97322c5da 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {

Spigot-Server-Patches/Configurable-container-update-tick-rate.patch

@@ -19,7 +19,7 @@ index 1bb956515..e6aae7317 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1ed1859b8..4866f9f34 100644
+index b830f833f..bf3e46c35 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/Configurable-end-credits.patch

@@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 030a3e51c..79c9601fa 100644
+index f7edd9aa1..dbc5cf632 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch

@@ -6,24 +6,8 @@ Subject: [PATCH] Don't create Region File's when checking if chunk exists
 Plugins like Dynmap can end up creating tons of emtpy Region Files
 when using chunkExists.
 
-diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 4890023d7..79cb3953b 100644
---- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-             }
-         }
- 
--        return RegionFileCache.a(this.d, i, j).chunkExists(i & 31, j & 31);
-+        // Paper start - Don't create region files when checking that they exist
-+        final RegionFile region = RegionFileCache.a(this.d, i, j, false);
-+        return region != null && region.chunkExists(i & 31, j & 31);
-+        // Paper end
-     }
-     // CraftBukkit end
- 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index f23429898..933934fb6 100644
+index 6ec72689c..0163a4e59 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -0,0 +0,0 @@ public class RegionFileCache {

Spigot-Server-Patches/Enforce-Sync-Player-Saves.patch

@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 185b5929..91a45a75 100644
+index 58f30fb1d..034bdb7cf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {

Spigot-Server-Patches/Fix-Double-World-Add-issues.patch

@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 310ab96ab..19411212a 100644
+index 721a3cd81..90d069539 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {

Spigot-Server-Patches/Handle-Item-Meta-Inconsistencies.patch

@@ -144,7 +144,7 @@ index a54bc7c42..81ec8f69e 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index a9a338a82..0ac639f76 100644
+index 9d0c05cd0..ab50ee92e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ import java.lang.annotation.RetentionPolicy;

Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4866f9f34..cf12e51e4 100644
+index bf3e46c35..ad1bb7bab 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ import org.bukkit.inventory.MainHand;
@@ -34,7 +34,7 @@ index 4866f9f34..cf12e51e4 100644
          this.ch = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5f6b182d6..233903b5f 100644
+index 8e06c2140..61c32223d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/Optimise-removeQueue.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 32bce920b..56ce2554d 100644
+index eca224bdb..58d40f994 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ import com.google.common.collect.Lists;

Spigot-Server-Patches/Prevent-Auto-Save-if-Save-Queue-is-full.patch

@@ -23,7 +23,7 @@ index 220ecaf8d..4ca44afa9 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index ad668be62..916bf53f4 100644
+index 71df9e4aa..0fb1f8427 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,15 +51,16 @@ index ad668be62..916bf53f4 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 19411212a..139f2799c 100644
+index 90d069539..895882b2e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+         this.e = dataconvertermanager;
      }
  
-     // CraftBukkit start
 +    public int getQueueSize() { return queue.size(); } // Paper
-     public boolean chunkExists(World world, int i, int j) {
++
-         ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
+     // CraftBukkit start - Add async variant, provide compatibility
- 
+     @Nullable
+     public Chunk a(World world, int i, int j) throws IOException {
 --

Spigot-Server-Patches/Properly-fix-item-duplication-bug.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 56ce2554..a5c5bd4b 100644
+index 58d40f994..acb4469d2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index 56ce2554..a5c5bd4b 100644
  
      public void reset() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 43757500..7c2d43ac 100644
+index 437575003..7c2d43ac2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/Re-track-players-that-dismount-from-other-players.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cf12e51e4..acda1843d 100644
+index ad1bb7bab..4e8efc549 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/Timings-v2.patch

@@ -503,7 +503,7 @@ index 81fc04ed3..bd3b16025 100644
  
      private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index daf2c0a67..3ba489d4f 100644
+index 2d267e44b..2762d1838 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -525,7 +525,7 @@ index daf2c0a67..3ba489d4f 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a97e7d3c2..4890023d7 100644
+index 65fe4e2ec..bee52d783 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -1078,7 +1078,7 @@ index f74b06794..1fc632e0c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index be52f3ad1..d778eafb3 100644
+index 411720f2d..80bf61164 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@
@@ -1663,7 +1663,7 @@ index 3a95b4465..b5efb9c3f 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5ceb086e5..b56ae7a36 100644
+index 0c8295435..f4d71683a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;