From da9953aa8a60204dcfa011cbdaec038ca753263b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 2 Oct 2020 12:10:26 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8a046c95 Updated Upstream (CraftBukkit)
---
 Paper                                                |  2 +-
 current-paper                                        |  2 +-
 patches/server/0021-Player-invulnerabilities.patch   | 12 ++++++------
 .../server/0063-Add-permission-for-F3-N-debug.patch  |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Paper b/Paper
index 7f23e2cab..8a046c95a 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 7f23e2cab1bf6dc8aedbaf9493a677eb6dc14e2b
+Subproject commit 8a046c95a4babfdd3fec3c0f4fa198f1437819b5
diff --git a/current-paper b/current-paper
index 2be7851f7..87ceec8a7 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.3--db6101f7db49d148b1a296a8e6de4f9ff93de134
+1.16.3--fd414fa23a6ce82fdaaa1986abc23549af515254
diff --git a/patches/server/0021-Player-invulnerabilities.patch b/patches/server/0021-Player-invulnerabilities.patch
index db51e9d8d..5a5d5692f 100644
--- a/patches/server/0021-Player-invulnerabilities.patch
+++ b/patches/server/0021-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 237b85135..0ed9ab78c 100644
+index 3d77298806..58d042b473 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -144,6 +144,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,7 +67,7 @@ index 237b85135..0ed9ab78c 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 43a88b728..8b2f7d1f8 100644
+index 02feb7beca..61a4278c73 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1576,6 +1576,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,10 +79,10 @@ index 43a88b728..8b2f7d1f8 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 787e80c50..b40431aa4 100644
+index 38f26e25cb..c92a703da4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -902,6 +902,8 @@ public abstract class PlayerList {
+@@ -905,6 +905,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -92,7 +92,7 @@ index 787e80c50..b40431aa4 100644
          return entityplayer1;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2578a4677..c441fcea9 100644
+index 2578a4677d..c441fcea9b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -108,7 +108,7 @@ index 2578a4677..c441fcea9 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4904cb2ff..8cf61bf89 100644
+index 4904cb2ff1..8cf61bf894 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2171,5 +2171,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0063-Add-permission-for-F3-N-debug.patch b/patches/server/0063-Add-permission-for-F3-N-debug.patch
index e0bf1d8e9..2d1fcb6b4 100644
--- a/patches/server/0063-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0063-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b40431aa4..daf5beb0b 100644
+index c92a703da4..36dd79fc5b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1056,6 +1056,7 @@ public abstract class PlayerList {
+@@ -1059,6 +1059,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }