From bbcde382a29af4576518a7eec1d75b1723a99a33 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 10 Jun 2020 00:29:38 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
64666dc8 Improve Chunk Priority, Frustum Priority and Load Speed Algorithms
146b9908 Improve ChunkMapDistance.b crash fix to clean up properly
2c4499b7 Show Plugins Event Listeners under Combined Total in Timings
c5c909c9 Improve Plugin Ticket Management
b20529f3 Update to HTTPS in README (#3460)
de6dfedf Make Anti-Xray multithreaded (#3520)
531c4b3f Add PluginTickets to API Chunk Methods
b2d81e21 Improve Chunk Prioritization and Internal Scheduler
24a2e804 Improve Login to use Urgent priority - improves login chunk load times
---
 Paper                                         |  2 +-
 current-paper                                 |  2 +-
 patches/server/0002-Purpur-config-files.patch | 12 ++++----
 .../0005-Add-language-asset-purpur.lang.patch |  8 +++---
 patches/server/0008-Ridables.patch            | 12 ++++----
 .../server/0032-Signs-allow-color-codes.patch | 12 ++++----
 patches/server/0038-Implement-AFK-API.patch   | 14 +++++-----
 ...044-Players-should-not-cram-to-death.patch |  8 +++---
 .../0061-Alternative-Keepalive-Handling.patch |  8 +++---
 patches/server/0063-Add-moon-phase-API.patch  |  8 +++---
 ...4-Add-getPlacementBlockData-to-World.patch |  8 +++---
 .../0083-Add-permission-for-F3-N-debug.patch  |  8 +++---
 .../server/0104-Optimize-Chunk-Ticks.patch    | 10 +++----
 .../0114-Player-invulnerabilities.patch       | 28 +++++++++----------
 ...not-strip-colors-from-death-messages.patch |  6 ++--
 15 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/Paper b/Paper
index 9dfe1321d..64666dc8b 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 9dfe1321d55cb8f696bb95e8b0bcee7b03f305d2
+Subproject commit 64666dc8b605f0f2c2ac309378b1e973eb0e4956
diff --git a/current-paper b/current-paper
index f9f62e3a6..f029dbf58 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--01d75a1ec6f80206ead9ab685cdc0897e4264b7e
+1.15.2--98316d4df01a019c70ddea67c4b402fe38e87da5
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index bf7460d47..10ccb4da4 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From 13430809585e2fb2d3669d172f8f9efaccec5609 Mon Sep 17 00:00:00 2001
+From 3dbfa3127eb3282ea182166ac575910d736727c1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -62,7 +62,7 @@ index b07c49f1b4..cf5abd393e 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9de505d01f..f97b304ade 100644
+index 032b7acee8..fb584091af 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -74,11 +74,11 @@ index 9de505d01f..f97b304ade 100644
      public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
 @@ -136,6 +137,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
-     protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
+     protected World(WorldData worlddata, DimensionManager dimensionmanager, java.util.concurrent.Executor executor, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { // Paper - executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
 +        this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
-         this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
+         this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
          this.generator = gen;
          if (dimensionmanager.world == null) dimensionmanager.world = (WorldServer) this; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -364,7 +364,7 @@ index 0000000000..7d983d9a54
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 648dde01a7..64f1190b03 100644
+index 5496f8edee..2293a5dd8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -815,6 +815,7 @@ public final class CraftServer implements Server {
@@ -430,5 +430,5 @@ index d6e5d014c0..17ebc84f51 100644
                  acceptsAll(asList("server-name"), "Name of the server")
                          .withRequiredArg()
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0005-Add-language-asset-purpur.lang.patch b/patches/server/0005-Add-language-asset-purpur.lang.patch
index 29c134a16..e6e6b3df6 100644
--- a/patches/server/0005-Add-language-asset-purpur.lang.patch
+++ b/patches/server/0005-Add-language-asset-purpur.lang.patch
@@ -1,4 +1,4 @@
-From 0501bb760a4b2c1ddfb42b59e38fbb8f98e2d874 Mon Sep 17 00:00:00 2001
+From 4be161e9039519fbd95e15f53f7f070aa0bb5068 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 13:17:09 -0500
 Subject: [PATCH] Add language asset purpur.lang
@@ -12,10 +12,10 @@ Subject: [PATCH] Add language asset purpur.lang
  create mode 100644 src/main/resources/purpur.lang
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c88177b776..8c60e565ec 100644
+index 4ed4ad6bc3..9437a06d82 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1570,6 +1570,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1577,6 +1577,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      public void a(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype) {
@@ -131,5 +131,5 @@ index 0000000000..0967ef424b
 @@ -0,0 +1 @@
 +{}
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch
index 9494a0d45..4b9d221ea 100644
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -1,4 +1,4 @@
-From 67dffaad30d16e4b0c9918d58c710e4ebe9509b7 Mon Sep 17 00:00:00 2001
+From 88e8ee2a56a8905befcc383e7dfc05dada4eabbd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -3366,10 +3366,10 @@ index 0357c9da93..98a657cece 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8c60e565ec..dbdef3ad96 100644
+index 9437a06d82..4ecc89ac44 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1301,6 +1301,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1308,6 +1308,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3377,7 +3377,7 @@ index 8c60e565ec..dbdef3ad96 100644
          if (this.isPassenger()) {
              if (f >= -1.0F && f <= 1.0F) {
                  this.aZ = f;
-@@ -1313,7 +1314,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1320,7 +1321,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.jumping = flag;
              this.setSneaking(flag1);
          }
@@ -5227,7 +5227,7 @@ index 0c7f094e54..62a0810062 100644
          return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f97b304ade..d2fac7f296 100644
+index fb584091af..62daa6d2a6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -995,6 +995,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -6562,5 +6562,5 @@ index 0967ef424b..7125c0477e 100644
 +  "cannot.ride.mob": "You cannot mount that mob"
 +}
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0032-Signs-allow-color-codes.patch b/patches/server/0032-Signs-allow-color-codes.patch
index ce6005d52..745a79876 100644
--- a/patches/server/0032-Signs-allow-color-codes.patch
+++ b/patches/server/0032-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From 578bd4ebc2abd908e9f63ef91319e3a816115082 Mon Sep 17 00:00:00 2001
+From cf9b6fc643b669c8ecb12ae738fae6269ba21867 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Signs allow color codes
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
  4 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index dbdef3ad96..f0603a575c 100644
+index 4ecc89ac44..2a70beedc2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1141,6 +1141,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1148,6 +1148,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
@@ -23,10 +23,10 @@ index dbdef3ad96..f0603a575c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d52fbda79f..96161160bb 100644
+index 7123e197c7..4ac20e1ecc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2622,6 +2622,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2623,6 +2623,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end
@@ -82,5 +82,5 @@ index f8992136a7..94744c78ba 100644
      }
  
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0038-Implement-AFK-API.patch b/patches/server/0038-Implement-AFK-API.patch
index 965a3bbf6..d603c5042 100644
--- a/patches/server/0038-Implement-AFK-API.patch
+++ b/patches/server/0038-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 7da20b7f3bd17fd2432f48cb077c4370bb39492e Mon Sep 17 00:00:00 2001
+From 8e1600d2455ebc20f0534f28db43d60b2d8c1538 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
@@ -50,10 +50,10 @@ index 27cfc6654e..d62174e9c7 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f0603a575c..534f08815e 100644
+index 2a70beedc2..96f98926eb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1634,8 +1634,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1641,8 +1641,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.cj = SystemUtils.getMonotonicMillis();
@@ -171,7 +171,7 @@ index 1398c47a2f..0bf1a14b7c 100644
      public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
          double d4 = d3 * d3;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 96161160bb..762aad378c 100644
+index 4ac20e1ecc..57e8c22d05 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -206,7 +206,7 @@ index 96161160bb..762aad378c 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 41179fe312..e82d091746 100644
+index 40b522a1bf..57ec42c732 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -409,7 +409,7 @@ public class WorldServer extends World {
@@ -250,10 +250,10 @@ index d6405b2ec5..41dd1b8616 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 bd4d5184b6..7bd271d4c2 100644
+index 141003ca71..e15c123878 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2078,4 +2078,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2086,4 +2086,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return spigot;
      }
      // Spigot end
diff --git a/patches/server/0044-Players-should-not-cram-to-death.patch b/patches/server/0044-Players-should-not-cram-to-death.patch
index 0c5dad4a4..1f611592c 100644
--- a/patches/server/0044-Players-should-not-cram-to-death.patch
+++ b/patches/server/0044-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From 9529db7062205568ba0d4dc05d0dd9fad730bddf Mon Sep 17 00:00:00 2001
+From 2f72a538bb9769b59e5d9c52f4ff1869e5178117 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 534f08815e..18a74607fc 100644
+index 96f98926eb..9773923735 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1114,7 +1114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1121,7 +1121,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
@@ -21,5 +21,5 @@ index 534f08815e..18a74607fc 100644
  
      @Override
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0061-Alternative-Keepalive-Handling.patch b/patches/server/0061-Alternative-Keepalive-Handling.patch
index a1e9e1a95..abe2017be 100644
--- a/patches/server/0061-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0061-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From 0f59e2f777292ba288e3488eae06324d7e5159c7 Mon Sep 17 00:00:00 2001
+From 289e82a07dfc2238298bbc0d81819d1f57b55628 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
@@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 762aad378c..0cd012dfc3 100644
+index 57e8c22d05..80a75912fb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 762aad378c..0cd012dfc3 100644
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2659,6 +2675,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2660,6 +2676,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -90,5 +90,5 @@ index 72ad9dce7d..ed2a312773 100644
      private static void dontSendUselessEntityPackets() {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0063-Add-moon-phase-API.patch b/patches/server/0063-Add-moon-phase-API.patch
index ee409efcf..f74b59963 100644
--- a/patches/server/0063-Add-moon-phase-API.patch
+++ b/patches/server/0063-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From b3b4d02dc668165685959f67e420b92033d8b438 Mon Sep 17 00:00:00 2001
+From 04e2a3750f02b48b1370cf8fcf25a2da357f8aa4 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 d3c5b7d190..66f3e9393e 100644
+index f4a1be34f0..1913b31bc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2462,6 +2462,14 @@ public class CraftWorld implements World {
+@@ -2477,6 +2477,14 @@ public class CraftWorld implements World {
  
          return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
      }
@@ -27,5 +27,5 @@ index d3c5b7d190..66f3e9393e 100644
      @Override
      public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0064-Add-getPlacementBlockData-to-World.patch b/patches/server/0064-Add-getPlacementBlockData-to-World.patch
index d5f2866f0..20dfba23a 100644
--- a/patches/server/0064-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0064-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From e566feaf03a63249eef301206503eaf5a3226a17 Mon Sep 17 00:00:00 2001
+From b14da6ddd0633bf5359c178fb6610347e0ef6baf 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 66f3e9393e..414fc4baf9 100644
+index 1913b31bc1..82960af87d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2468,6 +2468,11 @@ public class CraftWorld implements World {
+@@ -2483,6 +2483,11 @@ public class CraftWorld implements World {
      public net.pl3x.purpur.MoonPhase getMoonPhase() {
          return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
      }
@@ -82,5 +82,5 @@ index 66f3e9393e..414fc4baf9 100644
  
      // Paper start
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0083-Add-permission-for-F3-N-debug.patch b/patches/server/0083-Add-permission-for-F3-N-debug.patch
index 1efe3bf0f..c9a95c0b5 100644
--- a/patches/server/0083-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0083-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From 49434b74bc69f64d58278a2a18b33ecfd3c78e87 Mon Sep 17 00:00:00 2001
+From aa5c11cb61cbc8abd619e4c328ebc1c3aba5562e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug
@@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7bb46cc7c6..55cda3dd66 100644
+index 54f6dfcaa7..29150bd7d7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -976,6 +976,7 @@ public abstract class PlayerList {
+@@ -979,6 +979,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
@@ -20,5 +20,5 @@ index 7bb46cc7c6..55cda3dd66 100644
              entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0));
          }
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0104-Optimize-Chunk-Ticks.patch b/patches/server/0104-Optimize-Chunk-Ticks.patch
index cad02c28f..477d3e815 100644
--- a/patches/server/0104-Optimize-Chunk-Ticks.patch
+++ b/patches/server/0104-Optimize-Chunk-Ticks.patch
@@ -1,4 +1,4 @@
-From d6198f2a5c16e6f40e43168cd9bc6c385bb5df15 Mon Sep 17 00:00:00 2001
+From 3d714cc11977af0d190a8bf90b53caeccea806bb 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Optimize Chunk Ticks
  2 files changed, 25 insertions(+), 39 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 54e89c9cc6..9af2c5c747 100644
+index d07fcc0c51..3a18260944 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -781,11 +781,12 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -790,11 +790,12 @@ public class ChunkProviderServer extends IChunkProvider {
              int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED);
              BlockPosition blockposition = this.world.getSpawn();
              // CraftBukkit start - Other mob type spawn tick rate
@@ -30,7 +30,7 @@ index 54e89c9cc6..9af2c5c747 100644
              // CraftBukkit end
  
              this.world.getMethodProfiler().enter("naturalSpawnCount");
-@@ -831,40 +832,11 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -840,40 +841,11 @@ public class ChunkProviderServer extends IChunkProvider {
                          if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(playerchunk, chunkcoordintpair, true)) { // Spigot // Paper - optimise isOutsideOfRange
                              this.world.getMethodProfiler().enter("spawner");
                              this.world.timings.mobSpawn.startTiming(); // Spigot
@@ -107,5 +107,5 @@ index 3ed7fa324f..7f236585db 100644
 +    // Purpur end
  }
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0114-Player-invulnerabilities.patch b/patches/server/0114-Player-invulnerabilities.patch
index f0ef1da65..082fc13c2 100644
--- a/patches/server/0114-Player-invulnerabilities.patch
+++ b/patches/server/0114-Player-invulnerabilities.patch
@@ -1,4 +1,4 @@
-From b7f030b1ffc4c53737500f213803d6a7e6f2628c Mon Sep 17 00:00:00 2001
+From 11fad2bb95551473eb3b77b0d52aed82d1151afe Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:44 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -12,10 +12,10 @@ Subject: [PATCH] Player invulnerabilities
  5 files changed, 42 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 18a74607fc..90305b61fc 100644
+index 9773923735..6572177c55 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -131,6 +131,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -132,6 +132,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.canPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index 18a74607fc..90305b61fc 100644
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -736,6 +738,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -743,6 +745,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -37,7 +37,7 @@ index 18a74607fc..90305b61fc 100644
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -743,7 +751,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -750,7 +758,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.m() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -46,7 +46,7 @@ index 18a74607fc..90305b61fc 100644
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1010,6 +1018,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1017,6 +1025,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
              // CraftBukkit end
@@ -55,7 +55,7 @@ index 18a74607fc..90305b61fc 100644
              return this;
          }
      }
-@@ -1998,9 +2008,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2005,9 +2015,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -75,10 +75,10 @@ index 18a74607fc..90305b61fc 100644
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0cd012dfc3..91e6952f4c 100644
+index 80a75912fb..3a1aa1d4da 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1530,6 +1530,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1531,6 +1531,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -87,10 +87,10 @@ index 0cd012dfc3..91e6952f4c 100644
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 55cda3dd66..d2ab05b51e 100644
+index 29150bd7d7..7b912d46f6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -824,6 +824,8 @@ public abstract class PlayerList {
+@@ -827,6 +827,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -122,10 +122,10 @@ index efdc176e64..81969d2dc9 100644
          playerSleepCondition = getString("gameplay-mechanics.player.sleep.condition", playerSleepCondition);
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7bd271d4c2..24e35ffeaf 100644
+index e15c123878..137699c3e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2094,5 +2094,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2102,5 +2102,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetIdleTimer();
      }
@@ -147,5 +147,5 @@ index 7bd271d4c2..24e35ffeaf 100644
      // Purpur end
  }
 -- 
-2.24.0
+2.26.2
 
diff --git a/patches/server/0115-Do-not-strip-colors-from-death-messages.patch b/patches/server/0115-Do-not-strip-colors-from-death-messages.patch
index a9db77f17..93e3b42ef 100644
--- a/patches/server/0115-Do-not-strip-colors-from-death-messages.patch
+++ b/patches/server/0115-Do-not-strip-colors-from-death-messages.patch
@@ -1,4 +1,4 @@
-From 7583059e4b66cf1353a7aa4c45371a03478266d7 Mon Sep 17 00:00:00 2001
+From 29f5172989a80f3eec58bc734b4abfeb27aeb76c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Jun 2020 13:16:02 -0500
 Subject: [PATCH] Do not strip colors from death messages
@@ -8,10 +8,10 @@ Subject: [PATCH] Do not strip colors from death messages
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 90305b61fc..0879f0904f 100644
+index 6572177c55..98e268c350 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -610,7 +610,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -617,7 +617,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();