Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
fb36f15d6 Let some more packets be send immediately, closes #4140 (#4896)
ede41fe16 Emancipate more features to PlayerHandshakeEvent
3fdeba1f5 [CI-SKIP] [Auto] Rebuild Patches
5fc07bd63 Maded Title-Objects directy sendable to targets
e7b9a478e Player Chunk Load/Unload Events
1d0cfc0cc MC-4 Fix item position desync
458db6206 Limit auto recipe packets

current-paper

@@ -1 +1 @@
-1.16.4--cfa07cbe0585adc3e575cf7c520dc0c17936b9f4
+1.16.4--8ff078813db86d42db9fd900c0f093f05b9594c4

patches/server/0001-Tuinity-Server-Changes.patch

@@ -8424,10 +8424,10 @@ index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369e
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 976c44c8eeecc513fa11de55b80317550f621407..27c368bf19292e1076e1990a1d733eeac33ec0f4 100644
+index 7240b885d96eb2df187b6229449af1a893a4524e..2c276971d47e48b39afa176994eba5747a3a3951 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -525,6 +525,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -527,6 +527,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  }
              }
  
@@ -9733,7 +9733,7 @@ index 1558c5f8256f50be6850f1d7f70eee3e8ec76496..b92ca4a6de01f3f86367fb8dfe3591b0
              Vec3D vec3d = new Vec3D(((double) pathpoint.a + this.a.locX()) / 2.0D, ((double) pathpoint.b + this.a.locY()) / 2.0D, ((double) pathpoint.c + this.a.locZ()) / 2.0D);
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515f38e5395 100644
+index fb1e3c705b8abee13695762cdfd0e9f1bfdb5ad8..6a0ec0105399066dede622b45c9471b32c162cf6 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -27,6 +27,8 @@ import org.apache.logging.log4j.Logger;
@@ -9849,7 +9849,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
              try {
                  a(packet, this.packetListener);
              } catch (CancelledPacketHandleException cancelledpackethandleexception) {
-@@ -220,7 +310,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -222,7 +312,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
              MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() &&
              (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())
          ))) {
@@ -9858,7 +9858,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
              return;
          }
          // write the packets to the queue, then flush - antixray hooks there already
-@@ -246,6 +336,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -248,6 +338,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
  
      private void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
      private void b(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
@@ -9873,7 +9873,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
          EnumProtocol enumprotocol = EnumProtocol.a(packet);
          EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get();
  
-@@ -268,7 +366,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -270,7 +368,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
              try {
                  // Paper end
  
@@ -9882,7 +9882,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
  
              if (genericfuturelistener != null) {
                  channelfuture.addListener(genericfuturelistener);
-@@ -288,39 +386,83 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -290,39 +388,83 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
              }
              // Paper end
          } else {
@@ -9996,7 +9996,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
          }
  
      }
-@@ -343,6 +485,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -345,6 +487,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
      }
      private boolean processQueue() {
          if (this.packetQueue.isEmpty()) return true;
@@ -10005,7 +10005,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
          // If we are on main, we are safe here in that nothing else should be processing queue off main anymore
          // But if we are not on main due to login/status, the parent is synchronized on packetQueue
          java.util.Iterator<QueuedPacket> iterator = this.packetQueue.iterator();
-@@ -350,16 +494,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -352,16 +496,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
              NetworkManager.QueuedPacket queued = iterator.next(); // poll -> peek
  
              // Fix NPE (Spigot bug caused by handleDisconnection())
@@ -10030,7 +10030,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
              }
          }
          return true;
-@@ -436,10 +586,16 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -438,10 +588,16 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
          return this.channel instanceof LocalChannel || this.channel instanceof LocalServerChannel;
      }
  
@@ -11204,10 +11204,10 @@ index 6c399bcea03e839bf2f21e92b5d76d46b7088667..d3bf356ea768a32a5684eb851a2a0add
      }
      // Paper end - optimised tracker
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a 100644
+index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -414,7 +414,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
  
                  // Paper start - Prevent moving into unloaded chunks
@@ -11218,7 +11218,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
                      this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
                      return;
                  }
-@@ -1053,7 +1055,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1058,7 +1060,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
  
                  if (this.teleportPos != null) {
@@ -11227,7 +11227,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
                          this.A = this.e;
                          this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
                      }
-@@ -1123,7 +1125,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1128,7 +1130,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
                              // Paper start - Prevent moving into unloaded chunks
@@ -11236,7 +11236,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
                                  this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
                                  return;
                              }
-@@ -1179,6 +1181,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1184,6 +1186,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              }
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -11244,7 +11244,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
                              this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
                              // Paper start - prevent position desync
                              if (this.teleportPos != null) {
-@@ -1203,7 +1206,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1208,7 +1211,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);

patches/server/0003-Purpur-config-files.patch

@@ -29,7 +29,7 @@ index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6ab0a51b421dc696aec292f2db955311c9cc31e3..e21ef1bdc61b7ae98eb752130a4d125c78c652d9 100644
+index 26db8a5d92d494e5f6ba9498d5a1aa555642a92b..5e24ddc7dce6f6ed45267df3217177583bdd9eb0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -118,6 +118,11 @@ public class PaperConfig {

patches/server/0009-AFK-API.patch

@@ -25,10 +25,10 @@ index caaa01b20e5b7430b809477022f8ab35f3c5bf20..335cb9c4a98ea9922ac5bdf9ee51a9f2
          super(EntityTypes.PLAYER, world);
          this.bL = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 27c368bf19292e1076e1990a1d733eeac33ec0f4..694159cca7f98d2680133321f38d5dce859cc1b3 100644
+index 2c276971d47e48b39afa176994eba5747a3a3951..08a3875d7a6b8a003ba133a835dcdd75849383ae 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1891,8 +1891,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1893,8 +1893,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ca = SystemUtils.getMonotonicMillis();
@@ -149,10 +149,10 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a11778fa44 100644
+index dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b..3a1016e345282eab9408c9caa294e7b7e01482f9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -245,6 +245,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
@@ -165,7 +165,7 @@ index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a1
              this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
              this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
          }
-@@ -501,6 +507,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -506,6 +512,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      this.lastYaw = to.getYaw();
                      this.lastPitch = to.getPitch();
  
@@ -174,7 +174,7 @@ index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a1
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1202,7 +1210,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1207,7 +1215,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                              if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
                                  flag1 = true;
@@ -183,7 +183,7 @@ index 1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a..347675d6dbf3bffeda45babb584fb2a1
                              }
  
                              this.player.setLocation(d4, d5, d6, f, f1);
-@@ -1241,6 +1249,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1246,6 +1254,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                      this.lastYaw = to.getYaw();
                                      this.lastPitch = to.getPitch();
  

patches/server/0018-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ 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 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a11ada49a4 100644
+index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc5726cb8822e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -148,6 +148,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -150,6 +150,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
@@ -17,7 +17,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -978,6 +980,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -980,6 +982,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -30,7 +30,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -985,7 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -987,7 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -39,7 +39,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1156,6 +1164,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1158,6 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
                  // CraftBukkit end
              }
  
@@ -47,7 +47,7 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
              return this;
          }
      }
-@@ -2299,9 +2308,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2311,9 +2320,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -67,10 +67,10 @@ index 694159cca7f98d2680133321f38d5dce859cc1b3..ddef5d06f46ecb4178928b8ca751d9a1
      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 347675d6dbf3bffeda45babb584fb2a11778fa44..b0f154080fde4ad3ce03655d3e42953accb1edd6 100644
+index 3a1016e345282eab9408c9caa294e7b7e01482f9..b59e82d8ca3132f448aba892741585406cdc023e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1651,6 +1651,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1656,6 +1656,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];

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

@@ -17,10 +17,10 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9e6c9562b 100644
+index b59e82d8ca3132f448aba892741585406cdc023e..c154c95ebba389290c7e2512e377b1c75a9c50e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -81,6 +81,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private long lastKeepAlive = SystemUtils.getMonotonicMillis(); private void setLastPing(long lastPing) { this.lastKeepAlive = lastPing;}; private long getLastPing() { return this.lastKeepAlive;}; // Paper - OBFHELPER
      private boolean awaitingKeepAlive; private void setPendingPing(boolean isPending) { this.awaitingKeepAlive = isPending;}; private boolean isPendingPing() { return this.awaitingKeepAlive;}; // Paper - OBFHELPER
      private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; };  // Paper - OBFHELPER
@@ -28,7 +28,7 @@ index b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
-@@ -214,6 +215,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -218,6 +219,21 @@ public class PlayerConnection implements PacketListenerPlayIn {
          long currentTime = SystemUtils.getMonotonicMillis();
          long elapsedTime = currentTime - this.getLastPing();
  
@@ -50,7 +50,7 @@ index b0f154080fde4ad3ce03655d3e42953accb1edd6..4debbe924dc530a363ecda070663ddd9
          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
-@@ -2817,6 +2833,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2830,6 +2846,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

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

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 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
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index f322dccd834ff56b99f8796309709b5b6ac01456..5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76 100644
---- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -134,6 +134,12 @@ public class EntityTrackerEntry {
-                 double vec3d_dz = this.tracker.locZ() - 2.44140625E-4D*(this.zLoc);
-                 boolean flag1 = (vec3d_dx * vec3d_dx + vec3d_dy * vec3d_dy + vec3d_dz * vec3d_dz) >= 7.62939453125E-6D;
-                 // Paper end - reduce allocation of Vec3D here
-+                // Purpur start - fix MC-4
-+                if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) {
-+                    Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX()), PacketPlayOutEntity.encrypt(tracker.locY()), PacketPlayOutEntity.encrypt(tracker.locZ()));
-+                    tracker.setPosition(loc.getX(), loc.getY(), loc.getZ());
-+                }
-+                // Purpur end - fix MC-4
-                 Packet<?> packet1 = null;
-                 boolean flag2 = flag1 || this.tickCounter % 60 == 0;
-                 boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
-diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index e5da2b19c1177ba7f88f0aaad9d810bb313ce67b..6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773 100644
---- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-+++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-@@ -14,10 +14,12 @@ public class PacketPlayOutEntity implements Packet<PacketListenerPlayOut> {
-     protected boolean h;
-     protected boolean i;
- 
-+    public static long encrypt(double d) { return a(d); } // Purpur - OBFHELPER
-     public static long a(double d0) {
-         return MathHelper.d(d0 * 4096.0D);
-     }
- 
-+    public static Vec3D decrypt(long x, long y, long z) { return a(x, y, z); } // Purpur - OBFHELPER
-     public static Vec3D a(long i, long j, long k) {
-         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 0a14d60703073e6476020c43f8349996f381400a..ef90290d21ecebf6d7c2bfc2f2a63f65a3d429e9 100644
---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -177,4 +177,9 @@ public class PurpurConfig {
-         InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
-         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
-     }
-+
-+    public static boolean fixItemPositionDesync = false;
-+    private static void fixItemPositionDesync() {
-+        fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
-+    }
- }

patches/server/0025-Logger-settings-suppressing-pointless-logs.patch

@@ -17,12 +17,12 @@ index c680319e4040be2b60795b22a5e65d6444cc67ed..eaa1063ff2bc5621e93043c4de41ca62
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ef90290d21ecebf6d7c2bfc2f2a63f65a3d429e9..3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1 100644
+index 0a14d60703073e6476020c43f8349996f381400a..55f174c1160420f084adaf70fbe4270ad96e6c38 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -182,4 +182,11 @@ public class PurpurConfig {
+@@ -177,4 +177,11 @@ public class PurpurConfig {
-     private static void fixItemPositionDesync() {
+         InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
-         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
+         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
 +
 +    public static boolean loggerSuppressInitLegacyMaterialError = false;

patches/server/0034-Dont-send-useless-entity-packets.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Dont send useless entity packets
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c3cded92a 100644
+index f322dccd834ff56b99f8796309709b5b6ac01456..228236bce14bfdf930570b453862dcfaae9e4823 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -178,6 +178,7 @@ public class EntityTrackerEntry {
+@@ -172,6 +172,7 @@ public class EntityTrackerEntry {
                          this.o = 0;
                          packet1 = new PacketPlayOutEntityTeleport(this.tracker);
                      }
@@ -16,7 +16,7 @@ index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c
                  }
  
                  if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
-@@ -264,6 +265,22 @@ public class EntityTrackerEntry {
+@@ -258,6 +259,22 @@ public class EntityTrackerEntry {
  
      }
  
@@ -40,7 +40,7 @@ index 5cb6bb896e8e71ee1b6b1ee3fff2fdb40cacfe76..aea72b0db10eed151db18490c02f291c
          this.tracker.c(entityplayer);
          entityplayer.c(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index 6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773..0010448e3aaafc53d0f8d60f36983cb381e7afc9 100644
+index 8e48407fd405ac4c3eece7762b8155c5d0f00fa0..91c4e658230bb8bbce9d0f56db0768a7c09f0095 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -5,11 +5,11 @@ import java.io.IOException;
@@ -61,7 +61,7 @@ index 6d9d52e4fc2cf55b21bfcb6cb1bcc6db9fb56773..0010448e3aaafc53d0f8d60f36983cb3
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1..6a622c7166dcedc7454ed2183e946a14c712104d 100644
+index 55f174c1160420f084adaf70fbe4270ad96e6c38..01dbf8e8e5dc1d42414f0b7229a95b2255243154 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -178,6 +178,11 @@ public class PurpurConfig {
@@ -73,6 +73,6 @@ index 3d0aebd0bf1bd570f19ee296cca9f5eb8e693af1..6a622c7166dcedc7454ed2183e946a14
 +        dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 +    }
 +
-     public static boolean fixItemPositionDesync = false;
+     public static boolean loggerSuppressInitLegacyMaterialError = false;
-     private static void fixItemPositionDesync() {
+     public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
-         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
+     private static void loggerSettings() {

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

@@ -5,10 +5,10 @@ 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 ddef5d06f46ecb4178928b8ca751d9a11ada49a4..a2924ab6185183adccd78faf3eec02ee71e45795 100644
+index 5c4d9b1f4e926909439b9c290d7cc5726cb8822e..32d1ca467fd80de220c5bdefd23c1f84d3c80917 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1416,6 +1416,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1418,6 +1418,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void openSign(TileEntitySign tileentitysign) {
@@ -17,10 +17,10 @@ index ddef5d06f46ecb4178928b8ca751d9a11ada49a4..a2924ab6185183adccd78faf3eec02ee
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4debbe924dc530a363ecda070663ddd9e6c9562b..7676659f44b84797aea0ffb4fc0ce6d934739e7b 100644
+index c154c95ebba389290c7e2512e377b1c75a9c50e4..e2cbffd113c3b49522786df62b4285fe6763434e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2814,6 +2814,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2827,6 +2827,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end

patches/server/0050-Controllable-Minecarts.patch

@@ -106,10 +106,10 @@ index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e
          this.move(EnumMoveType.SELF, this.getMot());
          if (!this.onGround) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a2924ab6185183adccd78faf3eec02ee71e45795..a295968ed35295d7247f7da37f8d9f56a7db6961 100644
+index 32d1ca467fd80de220c5bdefd23c1f84d3c80917..73bf1c5fa7aa700786c49905401b0e5d59c90d39 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -991,6 +991,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -993,6 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (this.isInvulnerable(damagesource)) {
              return false;
          } else {

patches/server/0052-Players-should-not-cram-to-death.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a295968ed35295d7247f7da37f8d9f56a7db6961..36168d0f7c730c636564808f4deb7cef42c35b64 100644
+index 73bf1c5fa7aa700786c49905401b0e5d59c90d39..4caca2cb5ce981aa555ceb7464fedc9e32779d88 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1393,7 +1393,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1395,7 +1395,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {

patches/server/0060-Configurable-TPS-Catchup.patch

@@ -24,10 +24,10 @@ index fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e..2d01bc9c5f95e7bd950a8c9137d1a1ab
                      this.methodProfiler.exit();
                      this.methodProfiler.b();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6a622c7166dcedc7454ed2183e946a14c712104d..c71fc3e4bbe2b56ae50700bb2e41192690e59da8 100644
+index 01dbf8e8e5dc1d42414f0b7229a95b2255243154..c627368c1dbfb526ff6c913130f908c67a794d1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -194,4 +194,9 @@ public class PurpurConfig {
+@@ -189,4 +189,9 @@ public class PurpurConfig {
          loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
          loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
      }

patches/server/0081-Item-entity-immunities.patch

@@ -17,7 +17,7 @@ index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612
          return this.O == tag;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae2fbce7b3 100644
+index f41aaa7623c052b9f4044898d1bdee898c03057a..1ab024c19761d97d0ac81edcc3fb1d9be8c40b5f 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -23,6 +23,8 @@ public class EntityItem extends Entity {
@@ -51,10 +51,10 @@ index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae
      }
  
      @Override
-@@ -523,4 +533,15 @@ public class EntityItem extends Entity {
+@@ -535,4 +545,15 @@ public class EntityItem extends Entity {
-     public Packet<?> P() {
+         super.setPositionRaw(x, y, z);
-         return new PacketPlayOutSpawnEntity(this);
      }
+     // Paper end - fix MC-4
 +
 +    // Purpur start
 +    public void respawnOnClient() {
@@ -68,7 +68,7 @@ index ba73d14437cfdf07ef0f1f6266131c113c2741fd..f55d40c981c75decfd7951669d541bae
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index aea72b0db10eed151db18490c02f291c3cded92a..29731da08d57f26b4173fef3f6fd37b36deb892e 100644
+index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f4b5a11a5 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -106,6 +106,15 @@ public class EntityTrackerEntry {

patches/server/0082-Add-ping-command.patch

@@ -67,7 +67,7 @@ index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf953
          if (!(this.k instanceof EntityPlayer)) {
              throw CommandListenerWrapper.a.create();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c71fc3e4bbe2b56ae50700bb2e41192690e59da8..f137d2a2800fb82420c95b17bb7a93ea9bbc414d 100644
+index c627368c1dbfb526ff6c913130f908c67a794d1c..57bba3c0f8352a7137e54a3a279cb5e02dc8463a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,10 +133,12 @@ public class PurpurConfig {

patches/server/0088-Add-allow-water-in-end-world-option.patch

@@ -68,7 +68,7 @@ index a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9..7a82a894bb3f737cc80f0b4b8d7a1b25
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f137d2a2800fb82420c95b17bb7a93ea9bbc414d..35e54a7dfe88e33cb3e693194d300289469d3307 100644
+index 57bba3c0f8352a7137e54a3a279cb5e02dc8463a..f1e17dabe91a539332080ebb96a54833011441f2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,7 +1,6 @@
@@ -79,15 +79,15 @@ index f137d2a2800fb82420c95b17bb7a93ea9bbc414d..35e54a7dfe88e33cb3e693194d300289
  import net.minecraft.server.MinecraftServer;
  import net.pl3x.purpur.command.PurpurCommand;
  import org.bukkit.Bukkit;
-@@ -189,6 +188,11 @@ public class PurpurConfig {
+@@ -185,6 +184,11 @@ public class PurpurConfig {
-     private static void fixItemPositionDesync() {
+         dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
-         fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
      }
-+    
+ 
 +    public static boolean allowWaterPlacementInTheEnd = true;
 +    private static void allowWaterPlacementInEnd() {
 +        allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
 +    }
- 
++
      public static boolean loggerSuppressInitLegacyMaterialError = false;
      public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
+     private static void loggerSettings() {

patches/server/0089-Allow-color-codes-in-books.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadbef4b8ec2 100644
+index e2cbffd113c3b49522786df62b4285fe6763434e..7dab659663f0b9e115e3eee98ef71c072f52f061 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1003,7 +1003,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1008,7 +1008,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
          if (itemstack.getItem() == Items.WRITABLE_BOOK) {
              NBTTagList nbttaglist = new NBTTagList();
  
@@ -18,7 +18,7 @@ index 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadb
              ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
              itemstack.a("pages", (NBTBase) nbttaglist);
              CraftEventFactory.handleEditBookEvent(player, i, old, itemstack); // CraftBukkit
-@@ -1021,13 +1022,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1026,13 +1027,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  itemstack1.setTag(nbttagcompound.clone());
              }
  
@@ -35,7 +35,7 @@ index 7676659f44b84797aea0ffb4fc0ce6d934739e7b..bd206f1810283b409ea69cbfe471eadb
                  ChatComponentText chatcomponenttext = new ChatComponentText(s1);
                  String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
  
-@@ -1039,6 +1041,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1044,6 +1046,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
      }
  

patches/server/0090-Entity-lifespan.patch

@@ -92,10 +92,10 @@ index 7a40f0864677e54c3a0eca6dcb9a115864edfbbd..1d5d87e61946c674f61541455cf54018
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bd206f1810283b409ea69cbfe471eadbef4b8ec2..a57588acf06802fbcf086dd1533bf9619d49e22f 100644
+index 7dab659663f0b9e115e3eee98ef71c072f52f061..54b77cab50fedb529998cb972cbe68b6f94f1dc4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2214,6 +2214,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2219,6 +2219,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;

patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch

@@ -17,10 +17,10 @@ index 4ffad61ce7ec81e9e329c117c9d122c51dbb4f69..6046b4788ba8f170e6f5fa021750936f
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 36168d0f7c730c636564808f4deb7cef42c35b64..69be072e7664dd8d54ad98300bdfbba3351dbeab 100644
+index 4caca2cb5ce981aa555ceb7464fedc9e32779d88..0d4ab4e8eda4059fbafe7645c9627ab5566edd85 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -2366,4 +2366,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2378,4 +2378,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end

patches/server/0093-Configurable-end-spike-seed.patch

@@ -25,7 +25,7 @@ index 00a1707209b21fc0163960c957864f798da15554..5eb9b3d35e12c2d3dc5f158cbed0b0a0
          List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 35e54a7dfe88e33cb3e693194d300289469d3307..5405928a681d4de0b47952c9c917e0037093df8c 100644
+index f1e17dabe91a539332080ebb96a54833011441f2..bd6e173fe9daae2db5bec5fd8085565d702a3dff 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@

patches/server/0094-Configurable-dungeon-seed.patch

@@ -31,7 +31,7 @@ index 07f7b69fefe66ec4f26ca7b4fb3b752e80aeed07..6aa1626f38df0cd8ae8a417dc4fca213
          int i = random.nextInt(2) + 2;
          int j = -i - 1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 5405928a681d4de0b47952c9c917e0037093df8c..37f666251e2a8cc84484a70ed64c2725cc3e7eb3 100644
+index bd6e173fe9daae2db5bec5fd8085565d702a3dff..b3f21efe94bd2765919c069ba49667f23780cd7f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,10 +141,13 @@ public class PurpurConfig {

patches/server/0099-Fix-death-message-colors.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix death message colors
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 69be072e7664dd8d54ad98300bdfbba3351dbeab..05f9a8185489434d274301ba0a62213a5ea0ef3f 100644
+index 0d4ab4e8eda4059fbafe7645c9627ab5566edd85..933d90e7026adc44e95a7c4083d6f9174ffb1f6c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -839,7 +839,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -841,7 +841,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();
  

patches/server/0100-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a57588acf06802fbcf086dd1533bf9619d49e22f..261dbea122b092afb413e034f2cefec8002941c7 100644
+index 54b77cab50fedb529998cb972cbe68b6f94f1dc4..68a2bf3112786a6c9fb8cd5a0c82d8730ecfb15a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1973,7 +1973,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1978,7 +1978,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              return null;
                          }
  
@@ -26,7 +26,7 @@ index a57588acf06802fbcf086dd1533bf9619d49e22f..261dbea122b092afb413e034f2cefec8
                          PlayerConnection.this.minecraftServer.console.sendMessage(message);
                          if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
                              for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
-@@ -2006,7 +2014,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2011,7 +2019,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  // Paper Start - (Meh) Support for vanilla world scoreboard name coloring
                  String displayName = event.getPlayer().getDisplayName();
                  if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {

patches/server/0104-Add-option-to-disable-mushroom-block-updates.patch

@@ -73,10 +73,10 @@ index e8f340b9f2a1e5de9cf7e8cf595de8a806cb528a..3490af6fe0cf2eccac9753778cf4085f
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 37f666251e2a8cc84484a70ed64c2725cc3e7eb3..46d99d1e7b10aa63f064e2016a5ca53a5290397a 100644
+index b3f21efe94bd2765919c069ba49667f23780cd7f..ec7bac5b7576df2e50be56471384fe6374dc9a30 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -205,6 +205,11 @@ public class PurpurConfig {
+@@ -200,6 +200,11 @@ public class PurpurConfig {
          allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
      }
  

patches/server/0109-Short-enderman-height.patch

@@ -30,7 +30,7 @@ index 37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb..7a35a367a5840fd5df72b0bd64e63019
      public static final EntityTypes<EntityEvoker> EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8));
      public static final EntityTypes<EntityEvokerFangs> EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 46d99d1e7b10aa63f064e2016a5ca53a5290397a..f75df999005e4d2bab4df82531a37fc914d84175 100644
+index ec7bac5b7576df2e50be56471384fe6374dc9a30..ef423e986d25e089d6063b17bf7b2f8d6430297b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -190,6 +190,11 @@ public class PurpurConfig {

patches/server/0111-Ridables.patch

@@ -3211,10 +3211,10 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6
          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 05f9a8185489434d274301ba0a62213a5ea0ef3f..b5f6a98fe44c30417a3b3496dc45238c99c23ebe 100644
+index 933d90e7026adc44e95a7c4083d6f9174ffb1f6c..a1abdd06478da22bd9c7ea4555afb36efde826c7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -506,6 +506,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
  
          this.advancementDataPlayer.b(this);
@@ -4973,10 +4973,10 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 261dbea122b092afb413e034f2cefec8002941c7..f4f4127b017215ff26b406ff22db8da77c9cbf92 100644
+index 68a2bf3112786a6c9fb8cd5a0c82d8730ecfb15a..dcbed41f6dd03e3f01e9741f55c57688f36b5ced 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2231,6 +2231,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2236,6 +2236,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                      this.server.getPluginManager().callEvent(event);
  
@@ -5053,7 +5053,7 @@ index 9d93a8c86b675cf55210724a0b695f960b009d69..bed00077205d3c2d7b2eb67db5af86dd
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f75df999005e4d2bab4df82531a37fc914d84175..6e22d0cd05cc5f0d8d66b03b6484859aad0a387c 100644
+index ef423e986d25e089d6063b17bf7b2f8d6430297b..1a14a3f05ef42fb5161f8df2d96f4236633d641e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -134,11 +134,13 @@ public class PurpurConfig {

patches/server/0113-Crying-obsidian-valid-for-portal-frames.patch

@@ -42,7 +42,7 @@ index 6ef81aeb4c63bc6c23163796dbd977602ca2f540..9ea3c30b679da4e77b86d96d0cc47673
      private final GeneratorAccess b;
      private final EnumDirection.EnumAxis c;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6e22d0cd05cc5f0d8d66b03b6484859aad0a387c..b71d3187e81241834827dc36352d87b0397d62b4 100644
+index 1a14a3f05ef42fb5161f8df2d96f4236633d641e..3311a78781739f5b7ea8a490366788b961104660 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -176,6 +176,7 @@ public class PurpurConfig {