Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d33ba160 Fix incorrect keyword use on visibleChunksClone
2f343015 Updated Upstream (Bukkit/CraftBukkit)
a65831bd Optimize PlayerChunkMap memory use for visibleChunks

current-paper

@@ -1 +1 @@
-1.15.2--d5f8b4d6c2c07ecd85fe02255b205f1c72390c72
+1.15.2--57471065365b19e16dbae57049701025c1055af2

patches/api/0007-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 464c7f06726b30fef190cdffe4953f2c12a9630d Mon Sep 17 00:00:00 2001
+From 47f895fa7d4f5d6efc3fd329a7be976f1c296863 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 10 Aug 2019 22:19:56 -0500
 Subject: [PATCH] Implement AFK API
@@ -87,10 +87,10 @@ index 000000000..0c8b3e5e4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ea4f32..b9fe2a0fa 100644
+index 3600b4c84..3009fa3ca 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1823,4 +1823,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/server/0039-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 190e3873141083981bc52c2c422d840488f46f44 Mon Sep 17 00:00:00 2001
+From e9bdca4840b46744fdac8cd236bcb80545361c47 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -250,10 +250,10 @@ index c6bf9395c1..76f8c8fed1 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 60f62f19cb..fa9fc940a2 100644
+index 33cac5fcb1..aa6f67cad3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2092,4 +2092,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2057,4 +2057,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end

patches/server/0065-Add-moon-phase-API.patch

@@ -1,4 +1,4 @@
-From a5bd89f5ecdb5d2ecefd9bcb2ecbe87bc93a7c64 Mon Sep 17 00:00:00 2001
+From 7151dc13ef404e96cb75b6cd798cad2dfaebf073 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:16 -0600
 Subject: [PATCH] Add moon phase API
@@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API
  1 file changed, 8 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 051506fce8..1e071c4f92 100644
+index c0e8eb85d7..a9b5aebc5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2445,6 +2445,14 @@ public class CraftWorld implements World {
+@@ -2448,6 +2448,14 @@ public class CraftWorld implements World {
  
          return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
      }

patches/server/0066-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From e731b3f90988e40ca31e13098fc8e1fbf5a88553 Mon Sep 17 00:00:00 2001
+From f896ee41ea77dca8f6780c15fea5dfd93a5e21ff Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:30:17 -0600
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -66,10 +66,10 @@ index 9c9b93f280..74a722cce5 100644
      public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
      public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1e071c4f92..0cd9c98eb8 100644
+index a9b5aebc5b..1da89471a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2451,6 +2451,11 @@ public class CraftWorld implements World {
+@@ -2454,6 +2454,11 @@ public class CraftWorld implements World {
      public net.pl3x.purpur.MoonPhase getMoonPhase() {
          return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
      }

patches/server/0067-Barrels-have-6-rows.patch

@@ -1,4 +1,4 @@
-From 51887c8d479ca17be120f8320c13a43792d272a3 Mon Sep 17 00:00:00 2001
+From 3b81011884895ab7dba9c3f29a536a2ec0268dad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Barrels have 6 rows
@@ -6,8 +6,8 @@ Subject: [PATCH] Barrels have 6 rows
 ---
  src/main/java/net/minecraft/server/TileEntityBarrel.java | 5 +++--
  src/main/java/net/pl3x/purpur/PurpurConfig.java          | 9 +++++++++
- .../org/bukkit/craftbukkit/inventory/CraftContainer.java | 5 ++++-
- 3 files changed, 16 insertions(+), 3 deletions(-)
+ .../org/bukkit/craftbukkit/inventory/CraftContainer.java | 4 +++-
+ 3 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
 index 1e27abbea0..ca3b6c9aae 100644
@@ -69,18 +69,10 @@ index 777f167293..392f4f8771 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index b4a7d982eb..afb40a7523 100644
+index 4f43f87cd4..9f05b76ff7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -155,6 +155,7 @@ public class CraftContainer extends Container {
-                 return Containers.GRINDSTONE;
-             case STONECUTTER:
-                 return Containers.STONECUTTER;
-+            case BARREL: return net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3; // Purpur
-             default:
-                 return Containers.GENERIC_9X3;
-         }
-@@ -168,8 +169,10 @@ public class CraftContainer extends Container {
+@@ -195,8 +195,10 @@ public class CraftContainer extends Container {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:

patches/server/0068-Enderchest-6-rows-plus-permissions.patch

@@ -1,4 +1,4 @@
-From 19559ab2a0001868fe0f30486e873b974c37ca48 Mon Sep 17 00:00:00 2001
+From 730a0b2c96d54f9bba6c241e2aabdb9e7e5aa2f6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 23 Jun 2019 17:01:26 -0500
 Subject: [PATCH] Enderchest 6 rows (plus permissions)
@@ -7,10 +7,10 @@ Subject: [PATCH] Enderchest 6 rows (plus permissions)
  .../net/minecraft/server/BlockEnderChest.java | 21 +++++++++++++++++++
  .../minecraft/server/InventoryEnderChest.java |  2 +-
  .../java/net/pl3x/purpur/PurpurConfig.java    |  8 +++++++
- .../craftbukkit/inventory/CraftContainer.java |  3 ++-
+ .../craftbukkit/inventory/CraftContainer.java |  2 +-
  .../craftbukkit/inventory/CraftInventory.java |  2 +-
  .../permissions/CraftDefaultPermissions.java  |  8 +++++++
- 6 files changed, 41 insertions(+), 3 deletions(-)
+ 6 files changed, 40 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
 index 0a892a5f1a..e7ef571dc5 100644
@@ -85,18 +85,10 @@ index 392f4f8771..3f8648cd71 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index afb40a7523..7bf1e224a6 100644
+index 9f05b76ff7..4dc632d917 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -156,6 +156,7 @@ public class CraftContainer extends Container {
-             case STONECUTTER:
-                 return Containers.STONECUTTER;
-             case BARREL: return net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3; // Purpur
-+            case ENDER_CHEST: return net.pl3x.purpur.PurpurConfig.enderChestSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3; // Purpur
-             default:
-                 return Containers.GENERIC_9X3;
-         }
-@@ -169,7 +170,7 @@ public class CraftContainer extends Container {
+@@ -195,7 +195,7 @@ public class CraftContainer extends Container {
              case PLAYER:
              case CHEST:
              case ENDER_CHEST:

patches/server/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch

@@ -1,4 +1,4 @@
-From e551815a914ba37fcc2f574f3972912e1eb7d9e6 Mon Sep 17 00:00:00 2001
+From 36028417beb9fccaf9738d4a435038f84a9d139b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7451b7fc4b..c1d23dc324 100644
+index ae36518374..b2dd0c2073 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1391,8 +1391,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -25,10 +25,10 @@ index 7451b7fc4b..c1d23dc324 100644
  
      public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0cd9c98eb8..05f0025bb9 100644
+index 1da89471a0..e3240c431a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -379,12 +379,16 @@ public class CraftWorld implements World {
+@@ -381,12 +381,16 @@ public class CraftWorld implements World {
      @Override
      public boolean setSpawnLocation(int x, int y, int z) {
          try {

patches/server/0109-Optimize-Chunk-Ticks.patch

@@ -1,16 +1,16 @@
-From e1b82153644d4323bfd9f68ce0ee1a96a0ba69af Mon Sep 17 00:00:00 2001
+From a5ff94c33d6be044c252853121f6b3d491251720 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 00:28:06 -0500
 Subject: [PATCH] Optimize Chunk Ticks
 
 ---
- .../minecraft/server/ChunkProviderServer.java | 70 ++++++-------------
+ .../minecraft/server/ChunkProviderServer.java | 72 ++++++-------------
  .../minecraft/server/EnumCreatureType.java    | 14 ++++
  .../net/minecraft/server/PlayerChunkMap.java  | 30 ++++----
- 3 files changed, 51 insertions(+), 63 deletions(-)
+ 3 files changed, 52 insertions(+), 64 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1dcd0980ec..c9d904ae64 100644
+index 59055cccc5..aad33cdc18 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -630,11 +630,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -31,7 +31,7 @@ index 1dcd0980ec..c9d904ae64 100644
              // CraftBukkit end
  
              this.world.getMethodProfiler().enter("naturalSpawnCount");
-@@ -660,15 +661,17 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -660,16 +661,18 @@ public class ChunkProviderServer extends IChunkProvider {
  
              this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
              this.world.getMethodProfiler().exit();
@@ -44,6 +44,7 @@ index 1dcd0980ec..c9d904ae64 100644
 -                entityPlayer.playerNaturallySpawnedEvent.callEvent();
 -            };
 -            // Paper end
+-            this.playerChunkMap.visibleChunks.values().forEach((playerchunk) -> { // Paper - no need to wrap iterator
 +            // Purpur start
 +            if (com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent.getHandlerList().getRegisteredListeners().length > 0) {
 +                // Paper start - call player naturally spawn event
@@ -55,9 +56,10 @@ index 1dcd0980ec..c9d904ae64 100644
 +                // Paper end
 +            }
 +            // Purpur end
-             this.playerChunkMap.f().forEach((playerchunk) -> {
++                this.playerChunkMap.visibleChunks.values().forEach((playerchunk) -> { // Paper - no need to wrap iterator
                  Optional<Chunk> optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
  
+                 if (optional.isPresent()) {
 @@ -688,40 +691,11 @@ public class ChunkProviderServer extends IChunkProvider {
                          if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot
                              this.world.getMethodProfiler().enter("spawner");
@@ -135,10 +137,10 @@ index 3ed7fa324f..7f236585db 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index bfa62e13e9..2a9fdc092e 100644
+index fbd3e4ea2c..1c7c3f96fb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1300,28 +1300,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1333,28 +1333,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) {

patches/server/0114-Async-recalc-perms-and-command-map.patch

@@ -1,4 +1,4 @@
-From 91fb88a18fbf6235e8a4aa3e486c02c7631cf81c Mon Sep 17 00:00:00 2001
+From ca4b3786bb468c1d5f6284cd20c8eacf0c52ea30 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 8 Apr 2020 23:01:20 -0500
 Subject: [PATCH] Async recalc perms and command map
@@ -9,7 +9,7 @@ Subject: [PATCH] Async recalc perms and command map
  2 files changed, 15 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 67228329bd..df6fe980b0 100644
+index d1c92667d8..a6b9aa898e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -759,6 +759,15 @@ public abstract class PlayerList {
@@ -37,11 +37,11 @@ index 67228329bd..df6fe980b0 100644
          if (entityplayer.playerConnection != null) {
              byte b0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 46be1f205d..1d472dd144 100644
+index b42b3dfa72..0c4c4ee9d2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -218,4 +218,9 @@ public class PurpurConfig {
-             TicketType.DELAYED_UNLOAD.loadPeriod = delayChunkUnloadsBy;
+@@ -207,4 +207,9 @@ public class PurpurConfig {
+             enchantment.setMaxLevel(maxLevel);
          }
      }
 +

patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch

@@ -1,4 +1,4 @@
-From 140ca22b4dd0d3cea7dcf32ddef49abd6f0e6af3 Mon Sep 17 00:00:00 2001
+From eaf229d5d413bbfc09c1068cac5d9636a5e36858 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch

@@ -1,4 +1,4 @@
-From b983b3ea803ff460b2bc7e29990dc9fb1cd24f5b Mon Sep 17 00:00:00 2001
+From 4a700e25f0c15801d2da6808f3849ba8a9609966 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
@@ -38,7 +38,7 @@ index cb36334e41..aa83ef1699 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ecf326d697..944ecc0723 100644
+index 833b58f858..46c6742da8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -191,6 +191,15 @@ public class PurpurWorldConfig {

patches/server/0117-MC-4-Fix-Item-position-desync.patch

@@ -1,4 +1,4 @@
-From f486e438695a437bf15a552bf738cf47169acf1a Mon Sep 17 00:00:00 2001
+From bf9f69ee5bce7695393d8e5a7be25c4bfb19817d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] MC-4 Fix - Item position desync
@@ -44,7 +44,7 @@ index 5b1d959354..0010448e3a 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b42b3dfa72..7699b81dad 100644
+index 0c4c4ee9d2..6a3723202c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -166,8 +166,10 @@ public class PurpurConfig {

patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch

@@ -1,4 +1,4 @@
-From 5c1eae3df43971867b4b8b766c3d3c3676e5d8cd Mon Sep 17 00:00:00 2001
+From 053436f0f4c6944382bad7812ed408eec1cb1f5e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] MC-56653 Fix - pig zombies aggro

patches/server/0119-EMC-MonsterEggSpawn-Event.patch

@@ -1,4 +1,4 @@
-From 89e3847f2604d96d3816e61252588bbf3951db7f Mon Sep 17 00:00:00 2001
+From e42dc0bc24e7637b4ab0f765eb54bc0b2aa4cd26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 20 Jul 2013 22:40:56 -0400
 Subject: [PATCH] EMC - MonsterEggSpawn Event

patches/server/0120-EMC-Optimize-Pathfinding.patch

@@ -1,4 +1,4 @@
-From cf86a69474750822daefd4abea81417e33918a4e Mon Sep 17 00:00:00 2001
+From c1f79bb11410fae47c95eeecbea77c94bf2fed1a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] EMC - Optimize Pathfinding

patches/server/0121-PaperPR-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From 305f236576d74ce125f772938bf21faca88f7a8f Mon Sep 17 00:00:00 2001
+From e515eecb410d5ba2849ee9d4fa6fda902bd4cbae Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] PaperPR - Add BellRingEvent

patches/server/0122-PaperPR-Per-World-Spawn-limits.patch

@@ -1,4 +1,4 @@
-From c2c6d54ba01759c277efa80ab822f7ec56c5ced0 Mon Sep 17 00:00:00 2001
+From 2df3e706cdbb46a108aa24cb76b517c71b9de9e1 Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] PaperPR - Per World Spawn limits
@@ -31,10 +31,10 @@ index b844b93d77..f1cca7219e 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05f0025bb9..ad2545d3a4 100644
+index e3240c431a..8cb9296c36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -328,6 +328,13 @@ public class CraftWorld implements World {
+@@ -330,6 +330,13 @@ public class CraftWorld implements World {
          this.generator = gen;
  
          environment = env;

patches/server/0123-Tuinity-Delay-chunk-unloads.patch

@@ -1,4 +1,4 @@
-From 6eefb42fb2789465e3680bb21214b229db31bded Mon Sep 17 00:00:00 2001
+From 8f252f1536581e5d6fa968503d254b706c908512 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Oct 2019 02:11:30 -0700
 Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -185,7 +185,7 @@ index 4b87ca2ecb..346e2ebc79 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7699b81dad..46be1f205d 100644
+index 6a3723202c..eda4be515c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -4,6 +4,7 @@ import com.google.common.base.Throwables;
@@ -196,9 +196,9 @@ index 7699b81dad..46be1f205d 100644
  import org.bukkit.Bukkit;
  import org.bukkit.command.Command;
  import org.bukkit.configuration.InvalidConfigurationException;
-@@ -209,4 +210,12 @@ public class PurpurConfig {
-             enchantment.setMaxLevel(maxLevel);
-         }
+@@ -214,4 +215,12 @@ public class PurpurConfig {
+     private static void updatePermsAndCommandsAsync() {
+         updatePermsAndCommandsAsync = getBoolean("settings.update-permissions-and-commands-async", updatePermsAndCommandsAsync);
      }
 +
 +    public static int delayChunkUnloadsBy;
@@ -210,10 +210,10 @@ index 7699b81dad..46be1f205d 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ad2545d3a4..1cdb3d3d9e 100644
+index 8cb9296c36..dac94ec0fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -473,6 +473,7 @@ public class CraftWorld implements World {
+@@ -476,6 +476,7 @@ public class CraftWorld implements World {
          net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
          if (chunk != null) {
              world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);

patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch

@@ -1,4 +1,4 @@
-From 74469e0a48b975cc339b8c1038955bef5255bd6e Mon Sep 17 00:00:00 2001
+From 8d3e6d4ba1cb4ca09811708e434f758235d10adb Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Thu, 26 Mar 2020 18:34:18 -0700
 Subject: [PATCH] Tuinity - Don't run entity collision code if not needed

patches/server/0125-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch

@@ -1,4 +1,4 @@
-From dc18fa7822bc86a417fa66d150d132cc7b71b58c Mon Sep 17 00:00:00 2001
+From 0ccf09a1645bca549d5ab57a901dbc594406a733 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Fri, 3 Apr 2020 02:21:13 -0700
 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server

patches/server/0126-YAPFA-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From fb456b6e4d20cfe7f567d1210efcb816e8b90611 Mon Sep 17 00:00:00 2001
+From 2629a3e76dbc840dcd71ab2c8e6473467693cf2b Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler