Fixup timings patch

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 837594c940509612179c1fa1c2ca6be6c39d9b7e Mon Sep 17 00:00:00 2001
+From 19caf0f475af73934d0bf85cd718375b5f952518 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -1250,7 +1250,7 @@ index 66f74c106..542262fc8 100644
              CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ecb356013..c38963526 100644
+index ecb356013..e4eee465a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,6 +1,8 @@
@@ -1270,7 +1270,7 @@ index ecb356013..c38963526 100644
  import org.bukkit.craftbukkit.event.CraftEventFactory;
  import org.bukkit.event.entity.CreatureSpawnEvent;
  import org.bukkit.event.server.MapInitializeEvent;
-@@ -96,11 +97,16 @@ public class WorldServer extends World {
+@@ -96,10 +97,10 @@ public class WorldServer extends World {
          // CraftBukkit end
          this.nextTickListBlock = new TickListServer<>(this, (block) -> {
              return block == null || block.getBlockData().isAir();
@@ -1278,17 +1278,12 @@ index ecb356013..c38963526 100644
 +        }, IRegistry.BLOCK::getKey, IRegistry.BLOCK::get, this::b, "Blocks"); // Paper - Timings
          this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
              return fluidtype == null || fluidtype == FluidTypes.EMPTY;
-+<<<<<<< HEAD
+-        }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a);
-         }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a);
-         this.navigators = Sets.newHashSet();
-+=======
 +        }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a, "Fluids"); // Paper - Timings
-+        this.H = Sets.newHashSet();
+         this.navigators = Sets.newHashSet();
-+>>>>>>> Timings v2
          this.I = new ObjectLinkedOpenHashSet();
          this.dataManager = worldnbtstorage;
-         this.server = minecraftserver;
+@@ -296,20 +297,24 @@ public class WorldServer extends World {
-@@ -296,20 +302,28 @@ public class WorldServer extends World {
          this.N();
          this.a();
          gameprofilerfiller.exitEnter("chunkSource");
@@ -1306,12 +1301,8 @@ index ecb356013..c38963526 100644
 +        timings.scheduledBlocks.stopTiming(); // Spigot
  
          gameprofilerfiller.exitEnter("raid");
-+<<<<<<< HEAD
-         this.persistentRaid.a();
-+=======
 +        this.timings.raids.startTiming(); // Paper - timings
-+        this.c.a();
+         this.persistentRaid.a();
-+>>>>>>> Timings v2
          if (this.mobSpawnerTrader != null) {
              this.mobSpawnerTrader.a();
          }
@@ -1319,7 +1310,7 @@ index ecb356013..c38963526 100644
  
          gameprofilerfiller.exitEnter("blockEvents");
          timings.doSounds.startTiming(); // Spigot
-@@ -352,6 +366,7 @@ public class WorldServer extends World {
+@@ -352,6 +357,7 @@ public class WorldServer extends World {
  
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
              timings.entityTick.startTiming(); // Spigot
@@ -1327,7 +1318,7 @@ index ecb356013..c38963526 100644
              while (objectiterator.hasNext()) {
                  Entry<Entity> entry = (Entry) objectiterator.next();
                  Entity entity1 = (Entity) entry.getValue();
-@@ -384,6 +399,7 @@ public class WorldServer extends World {
+@@ -384,6 +390,7 @@ public class WorldServer extends World {
                  gameprofilerfiller.enter("tick");
                  if (!entity1.dead && !(entity1 instanceof EntityComplexPart)) {
                      this.a(this::entityJoinedWorld, entity1);
@@ -1335,7 +1326,7 @@ index ecb356013..c38963526 100644
                  }
  
                  gameprofilerfiller.exit();
-@@ -400,9 +416,11 @@ public class WorldServer extends World {
+@@ -400,9 +407,11 @@ public class WorldServer extends World {
  
              this.tickingEntities = false;
  
@@ -1347,7 +1338,7 @@ index ecb356013..c38963526 100644
  
              gameprofilerfiller.exit();
              timings.tickEntities.stopTiming(); // Spigot
-@@ -467,6 +485,7 @@ public class WorldServer extends World {
+@@ -467,6 +476,7 @@ public class WorldServer extends World {
          }
  
          gameprofilerfiller.exitEnter("tickBlocks");
@@ -1355,7 +1346,7 @@ index ecb356013..c38963526 100644
          if (i > 0) {
              ChunkSection[] achunksection = chunk.getSections();
              int l = achunksection.length;
-@@ -498,7 +517,7 @@ public class WorldServer extends World {
+@@ -498,7 +508,7 @@ public class WorldServer extends World {
                  }
              }
          }
@@ -1364,7 +1355,7 @@ index ecb356013..c38963526 100644
          gameprofilerfiller.exit();
      }
  
-@@ -780,6 +799,7 @@ public class WorldServer extends World {
+@@ -780,6 +790,7 @@ public class WorldServer extends World {
  
          if (!flag1) {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
@@ -1372,7 +1363,7 @@ index ecb356013..c38963526 100644
              if (iprogressupdate != null) {
                  iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
              }
-@@ -789,7 +809,10 @@ public class WorldServer extends World {
+@@ -789,7 +800,10 @@ public class WorldServer extends World {
                  iprogressupdate.c(new ChatMessage("menu.savingChunks", new Object[0]));
              }
  
@@ -1849,5 +1840,5 @@ index ca7789b5e..442383969 100644
      }
  }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0025-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 0a0aeec73ccf11be7323442e86fff56d1ae1e1b5 Mon Sep 17 00:00:00 2001
+From e33a76a4bc07f876fb9af25842d3d51294d765d9 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -101,10 +101,10 @@ index 22035b6c0..342484373 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c38963526..90f08db30 100644
+index e4eee465a..4b619dc3d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1164,6 +1164,11 @@ public class WorldServer extends World {
+@@ -1155,6 +1155,11 @@ public class WorldServer extends World {
                  this.navigators.add(((EntityInsentient) entity).getNavigation());
              }
              entity.valid = true; // CraftBukkit
@@ -134,5 +134,5 @@ index c82c21326..a29693674 100644
 +    // Paper end
  }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0034-Disable-thunder.patch

@@ -1,4 +1,4 @@
-From 48087a2935330eccfbd79774767a96cb7aba2194 Mon Sep 17 00:00:00 2001
+From cb98a880d1f6001a5cb252f2a0160ecfddb59668 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -19,10 +19,10 @@ index 25e071718..41436a4ea 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 90f08db30..465cda646 100644
+index 4b619dc3d..09a1f3ce3 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -446,7 +446,7 @@ public class WorldServer extends World {
+@@ -437,7 +437,7 @@ public class WorldServer extends World {
          gameprofilerfiller.enter("thunder");
          BlockPosition blockposition;
  
@@ -32,5 +32,5 @@ index 90f08db30..465cda646 100644
              if (this.isRainingAt(blockposition)) {
                  DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0035-Disable-ice-and-snow.patch

@@ -1,4 +1,4 @@
-From e6f27f91e80b08f0b05fcd074214da2d173f536d Mon Sep 17 00:00:00 2001
+From bc65337839b0d346936071cb6b9e770d7408fcb7 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -19,10 +19,10 @@ index 41436a4ea..f53d8b967 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 465cda646..fe20687b2 100644
+index 09a1f3ce3..280932ce1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -466,7 +466,7 @@ public class WorldServer extends World {
+@@ -457,7 +457,7 @@ public class WorldServer extends World {
          }
  
          gameprofilerfiller.exitEnter("iceandsnow");
@@ -32,5 +32,5 @@ index 465cda646..fe20687b2 100644
              BlockPosition blockposition1 = blockposition.down();
              BiomeBase biomebase = this.getBiome(blockposition);
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,4 +1,4 @@
-From 05b087370709a25f1f66b99d9d10904d5d813b7c Mon Sep 17 00:00:00 2001
+From 663ff229ed64a491e7b1de9d304170322485adbf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -22,10 +22,10 @@ index 64146effd..cc81e1cae 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index fe20687b2..8307379e9 100644
+index 280932ce1..38bbb3ce2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -450,7 +450,7 @@ public class WorldServer extends World {
+@@ -441,7 +441,7 @@ public class WorldServer extends World {
              blockposition = this.a(this.a(j, 0, k, 15));
              if (this.isRainingAt(blockposition)) {
                  DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
@@ -35,5 +35,5 @@ index fe20687b2..8307379e9 100644
                  if (flag1) {
                      EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this);
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,14 +1,14 @@
-From 0fa1b2946203fcb041f0a3bbd4f2483519b5b962 Mon Sep 17 00:00:00 2001
+From 95e3c5995098349a8c663fcb5198cee5b4dce478 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 30c9cfa12..64b80441f 100644
+index 70b8b41ea..5a813c93f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1132,7 +1132,7 @@ public class WorldServer extends World {
+@@ -1123,7 +1123,7 @@ public class WorldServer extends World {
          if (entity instanceof EntityInsentient) {
              this.navigators.remove(((EntityInsentient) entity).getNavigation());
          }
@@ -17,7 +17,7 @@ index 30c9cfa12..64b80441f 100644
          entity.valid = false; // CraftBukkit
      }
  
-@@ -1170,6 +1170,7 @@ public class WorldServer extends World {
+@@ -1161,6 +1161,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -26,5 +26,5 @@ index 30c9cfa12..64b80441f 100644
  
      }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From b34235812fc440fa306910d1562c5fb0f93ae857 Mon Sep 17 00:00:00 2001
+From 35b17f41a0ade215d61bc938a17bc058386f812b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -67,10 +67,10 @@ index 57633955c..7d5f6e220 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 64b80441f..f03e562c3 100644
+index 5a813c93f..8b17fb4b4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1617,7 +1617,7 @@ public class WorldServer extends World {
+@@ -1608,7 +1608,7 @@ public class WorldServer extends World {
              }
  
              bufferedwriter.write(String.format("entities: %d\n", this.entitiesById.size()));
@@ -79,7 +79,7 @@ index 64b80441f..f03e562c3 100644
              bufferedwriter.write(String.format("block_ticks: %d\n", this.getBlockTickList().a()));
              bufferedwriter.write(String.format("fluid_ticks: %d\n", this.getFluidTickList().a()));
              bufferedwriter.write("distance_manager: " + playerchunkmap.e().c() + "\n");
-@@ -1780,7 +1780,7 @@ public class WorldServer extends World {
+@@ -1771,7 +1771,7 @@ public class WorldServer extends World {
  
      private void a(Writer writer) throws IOException {
          CSVWriter csvwriter = CSVWriter.a().a("x").a("y").a("z").a("type").a(writer);
@@ -89,5 +89,5 @@ index 64b80441f..f03e562c3 100644
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -1,4 +1,4 @@
-From d0c50d51c53fc8166be18788e32fd3d238871671 Mon Sep 17 00:00:00 2001
+From 99a32746f9f98097d1a0708afde5fe5a246dfb3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -102,10 +102,10 @@ index a56ac3da8..2f1be1995 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f03e562c3..ea9899889 100644
+index 8b17fb4b4..bba5013d2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1094,6 +1094,7 @@ public class WorldServer extends World {
+@@ -1085,6 +1085,7 @@ public class WorldServer extends World {
                          {
                              if ( iter.next().trackee == entity )
                              {
@@ -127,5 +127,5 @@ index 256a13178..5768cd512 100644
  
      public RenderData() {
 -- 
-2.24.0
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From db10dbff71b014658808050b7f633e3e63505bd1 Mon Sep 17 00:00:00 2001
+From 9fa000d9172e630347678fb1b18345eaba93e149 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,10 +8,10 @@ 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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ea9899889..f606a7340 100644
+index bba5013d2..8bac56350 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -983,6 +983,7 @@ public class WorldServer extends World {
+@@ -974,6 +974,7 @@ public class WorldServer extends World {
      // CraftBukkit start
      private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
@@ -20,5 +20,5 @@ index ea9899889..f606a7340 100644
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0116-Chunk-registration-fixes.patch

@@ -1,4 +1,4 @@
-From c7c90ed5c44caa05b2d5c6ac1187a0598236b011 Mon Sep 17 00:00:00 2001
+From 8c7505611a70a6af57cfd8be15fd6c5a83d314d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f606a7340..38e618c78 100644
+index 8bac56350..f84e727d9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -682,7 +682,7 @@ public class WorldServer extends World {
+@@ -673,7 +673,7 @@ public class WorldServer extends World {
      public void chunkCheck(Entity entity) {
          this.getMethodProfiler().enter("chunkCheck");
          int i = MathHelper.floor(entity.locX() / 16.0D);
@@ -21,5 +21,5 @@ index f606a7340..38e618c78 100644
  
          if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 895fce81accc650f3508d1131cc9d246f1b9c88d Mon Sep 17 00:00:00 2001
+From 0dba0a057652fe23e7c2826b6636b2c2a87dbac7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 38e618c78..4a2e66977 100644
+index f84e727d9..8a8c2eaf5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,7 +55,7 @@ public class WorldServer extends World {
@@ -22,7 +22,7 @@ index 38e618c78..4a2e66977 100644
      boolean tickingEntities;
      private final MinecraftServer server;
      private final WorldNBTStorage dataManager;
-@@ -1390,12 +1390,17 @@ public class WorldServer extends World {
+@@ -1381,12 +1381,17 @@ public class WorldServer extends World {
      }
  
      public <T extends ParticleParam> int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
@@ -66,5 +66,5 @@ index b7db32833..a66e4c3f1 100644
                  x, y, z, // Position
                  count,  // Count
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From 667b89b151281f6d14e6abae5a052ab4538013c5 Mon Sep 17 00:00:00 2001
+From 792aa8e22f2ae684c1c8e27c50142a186d44f4c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -114,10 +114,10 @@ index 002f7e844..fd0f5c6f2 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4a2e66977..004a06b4b 100644
+index 8a8c2eaf5..eb311a731 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1036,7 +1036,7 @@ public class WorldServer extends World {
+@@ -1027,7 +1027,7 @@ public class WorldServer extends World {
                  {
                      if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                      {
@@ -126,7 +126,7 @@ index 4a2e66977..004a06b4b 100644
                      }
                  }
              }
-@@ -1059,7 +1059,7 @@ public class WorldServer extends World {
+@@ -1050,7 +1050,7 @@ public class WorldServer extends World {
                      {
                          if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                          {
@@ -193,5 +193,5 @@ index 94fbac5e4..7967222d9 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch

@@ -1,4 +1,4 @@
-From 72a0585532fc4fe8636e7544559888371ea398eb Mon Sep 17 00:00:00 2001
+From 79d6f7c19fc31722b836dca918c8005479ead258 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,10 +8,10 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 004a06b4b..5e6601d0f 100644
+index eb311a731..7d99d34ae 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1021,7 +1021,8 @@ public class WorldServer extends World {
+@@ -1012,7 +1012,8 @@ public class WorldServer extends World {
          if (entity1 == null) {
              return false;
          } else {
@@ -22,5 +22,5 @@ index 004a06b4b..5e6601d0f 100644
          }
      }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -1,4 +1,4 @@
-From ce5103ceb32a7b68f5c419fa1de27f12b29c2b5a Mon Sep 17 00:00:00 2001
+From c3bdd0b033e432a2df1f00ae4ae1b4f6d914fddd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -52,7 +52,7 @@ index 39b136935..7fcc8c52d 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5e6601d0f..110d6e571 100644
+index 7d99d34ae..0cd48c5bc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -75,6 +75,9 @@ public class WorldServer extends World {
@@ -65,7 +65,7 @@ index 5e6601d0f..110d6e571 100644
  
      // Add env and gen to constructor
      public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
-@@ -983,8 +986,28 @@ public class WorldServer extends World {
+@@ -974,8 +977,28 @@ public class WorldServer extends World {
      // CraftBukkit start
      private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
@@ -95,7 +95,7 @@ index 5e6601d0f..110d6e571 100644
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
          } else if (this.isUUIDTaken(entity)) {
-@@ -1156,7 +1179,24 @@ public class WorldServer extends World {
+@@ -1147,7 +1170,24 @@ public class WorldServer extends World {
                  }
              }
  
@@ -122,5 +122,5 @@ index 5e6601d0f..110d6e571 100644
              // CraftBukkit start - SPIGOT-5278
              if (entity instanceof EntityDrowned) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch

@@ -1,4 +1,4 @@
-From 1f69d5e3135d8797208b362e5b66fada181deb92 Mon Sep 17 00:00:00 2001
+From 77cd511493dcb88d5cc010802527140fb5ded829 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -63,10 +63,10 @@ index be8f6ac99..4a931aaf4 100644
      public float getBukkitYaw() {
          return this.yaw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 110d6e571..afae55973 100644
+index 0cd48c5bc..f4d6c68f4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -894,7 +894,7 @@ public class WorldServer extends World {
+@@ -885,7 +885,7 @@ public class WorldServer extends World {
  
          while (objectiterator.hasNext()) {
              Entity entity = (Entity) objectiterator.next();
@@ -75,7 +75,7 @@ index 110d6e571..afae55973 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
  
-@@ -1213,6 +1213,7 @@ public class WorldServer extends World {
+@@ -1204,6 +1204,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -83,7 +83,7 @@ index 110d6e571..afae55973 100644
              new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
          }
  
-@@ -1225,6 +1226,7 @@ public class WorldServer extends World {
+@@ -1216,6 +1217,7 @@ public class WorldServer extends World {
              this.removeEntityFromChunk(entity);
              this.entitiesById.remove(entity.getId());
              this.unregisterEntity(entity);
@@ -128,5 +128,5 @@ index 96ff39e13..cc4788c96 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch

@@ -1,4 +1,4 @@
-From 8994b45d4f74697c2e8d62bae6ff636740fef2ea Mon Sep 17 00:00:00 2001
+From 32d73956a6280906c022a88c9dd528d7ab5c56db Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@@ -46,10 +46,10 @@ index fd0f5c6f2..e46436623 100644
                  double d5 = d1 - entityplayer.locY();
                  double d6 = d2 - entityplayer.locZ();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index afae55973..640e40ef8 100644
+index f4d6c68f4..a0c714129 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1259,7 +1259,7 @@ public class WorldServer extends World {
+@@ -1250,7 +1250,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);
@@ -58,7 +58,7 @@ index afae55973..640e40ef8 100644
      }
  
      @Override
-@@ -1391,7 +1391,7 @@ public class WorldServer extends World {
+@@ -1382,7 +1382,7 @@ public class WorldServer extends World {
              BlockActionData blockactiondata = (BlockActionData) this.I.removeFirst();
  
              if (this.a(blockactiondata)) {
@@ -81,5 +81,5 @@ index cc4788c96..a2739b887 100644
  
      private static Map<String, GameRules.GameRuleKey<?>> gamerules;
 -- 
-2.24.0
+2.24.1