From eb97d8c821ed7b5717bec1f6bdd45818185140aa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Jul 2020 11:24:47 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4fd17445 Spawn player in correct world on login
---
 Paper                                                |  2 +-
 current-paper                                        |  2 +-
 patches/server/0025-Player-invulnerabilities.patch   | 12 ++++++------
 .../server/0068-Add-permission-for-F3-N-debug.patch  |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Paper b/Paper
index 43eb073db..4fd174452 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 43eb073db5520ad5f15f7dd3d2115866d8adbbed
+Subproject commit 4fd17445297b41e7121303bf886b32192346e715
diff --git a/current-paper b/current-paper
index 88ac3e62e..3b172e88b 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.1--cce5f605f0afdbfc5abbfdcb41dcea4688b1500f
+1.16.1--fe9d95fa7c6e6d0e3dff1c0bd3680fb64ca49707
diff --git a/patches/server/0025-Player-invulnerabilities.patch b/patches/server/0025-Player-invulnerabilities.patch
index 044f07acd..40c8d82b8 100644
--- a/patches/server/0025-Player-invulnerabilities.patch
+++ b/patches/server/0025-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 508a91418..07f8f0fa7 100644
+index 508a91418e..07f8f0fa7d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,7 +67,7 @@ index 508a91418..07f8f0fa7 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 aa6855c35..a7ace9034 100644
+index aa6855c356..a7ace9034d 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 aa6855c35..a7ace9034 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 3c5ba8f2f..5807e77da 100644
+index 3c2f1f140c..461cc24689 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -869,6 +869,8 @@ public abstract class PlayerList {
+@@ -880,6 +880,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -92,7 +92,7 @@ index 3c5ba8f2f..5807e77da 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 e8c8ba74b..14a5a4072 100644
+index e8c8ba74b9..14a5a40729 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2165,5 +2165,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0068-Add-permission-for-F3-N-debug.patch b/patches/server/0068-Add-permission-for-F3-N-debug.patch
index 09781a9b2..81a1a8069 100644
--- a/patches/server/0068-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0068-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 5807e77da..ec2bbd52c 100644
+index 461cc24689..b32bd49d77 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1023,6 +1023,7 @@ public abstract class PlayerList {
+@@ -1034,6 +1034,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }