Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
108efeee Fix zero reputation deleting villagers (#3857)
7db30ebd Use consistent priorities for light tasks
1de3f830 Support hex colors in getLastColors (#3922)
018d8602 Fix SPIGOT-5989 (#3920)
45909954 Fix moveToWorld worldserver reference (#3929)
9c16c413 [Auto] Updated Upstream (CraftBukkit)
45ffc2bf Move range check for block placing up (#3917)

current-paper

@@ -1 +1 @@
-1.16.1--16cb905fe84bd9bb78a9fc9634e7741566946741
+1.16.1--ae57c50ca6f745b3ca38eb835a105527e4a2006c

patches/api/0030-ChatColor-conveniences.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 44d597d7..5a7b6a01 100644
+index 4594701d..499b222d 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
-@@ -403,4 +403,30 @@ public enum ChatColor {
+@@ -413,4 +413,30 @@ public enum ChatColor {
              BY_CHAR.put(color.code, color);
          }
      }

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 508a91418e..07f8f0fa7d 100644
+index a00993e32..23c41684b 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,10 +67,10 @@ index 508a91418e..07f8f0fa7d 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 aa6855c356..a7ace9034d 100644
+index 1e61b179f..dd55667d2 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 {
+@@ -1580,6 +1580,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -79,10 +79,10 @@ index aa6855c356..a7ace9034d 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 3c2f1f140c..461cc24689 100644
+index 5ee90e2e5..42e7511e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -880,6 +880,8 @@ public abstract class PlayerList {
+@@ -890,6 +890,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
@@ -92,7 +92,7 @@ index 3c2f1f140c..461cc24689 100644
          return entityplayer1;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2578a4677d..c441fcea9b 100644
+index 2578a4677..c441fcea9 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 2578a4677d..c441fcea9b 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e8c8ba74b9..14a5a40729 100644
+index c278ad57d..1487a30d1 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 {

patches/server/0028-Alternative-Keepalive-Handling.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
-index 8e93f1540b..470f92c4fb 100644
+index 8e93f1540..470f92c4f 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
 @@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -17,7 +17,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 a7ace9034d..bbe56cefe1 100644
+index dd55667d2..6173eb97d 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 {
@@ -50,7 +50,7 @@ index a7ace9034d..bbe56cefe1 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
-@@ -2717,6 +2733,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2721,6 +2737,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -68,7 +68,7 @@ index a7ace9034d..bbe56cefe1 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6ff5e07834..f1d6c32fde 100644
+index 6ff5e0783..f1d6c32fd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -154,6 +154,11 @@ public class PurpurConfig {

patches/server/0056-Signs-allow-color-codes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3828eab1a..3ccfc969f 100644
+index 23c41684b..546ac194a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1269,6 +1269,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,10 +17,10 @@ index 3828eab1a..3ccfc969f 100644
  
      public int nextContainerCounter() { // CraftBukkit - void -> int
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bbe56cefe..bf94d3146 100644
+index 6173eb97d..c518d4346 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2714,6 +2714,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2718,6 +2718,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end

patches/server/0067-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 461cc2468..b32bd49d7 100644
+index 42e7511e0..05d3edd09 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1034,6 +1034,7 @@ public abstract class PlayerList {
+@@ -1044,6 +1044,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }

patches/server/0106-Entity-lifespan.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 8def5fbfb4..d447eb7960 100644
+index 8def5fbfb..d447eb796 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -92,10 +92,10 @@ index 8def5fbfb4..d447eb7960 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 06814b92a4..a823143ad0 100644
+index 194256e51..cb2358872 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2131,6 +2131,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2135,6 +2135,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
                      Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
                      PlayerInteractEntityEvent event;
@@ -104,7 +104,7 @@ index 06814b92a4..a823143ad0 100644
                          event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
                      } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2f5bc77e03..4e8a6992ab 100644
+index 2f5bc77e0..4e8a6992a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -101,6 +101,11 @@ public class PurpurWorldConfig {