Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@397349e Adventure 4.9.1 (#6634)
PaperMC/Paper@d0a2193 Fix interaction pos in range check (#6654)
PaperMC/Paper@6de48db Fix player death kept items not being in same slot (#6663)
PaperMC/Paper@3e3cea1 Ensure valid vehicle status (#6673)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 1707c10395e9dba7fd24d7bdf3d625b6b115ae44
+paperCommit = 3e3cea1a76247d518ee54d00ed9b727ea106aff3
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0004-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index afa245018192a63e5db8bc568ddea2790bf5b8a2..436c42649395fd6df3425c2ddeb85a99edf9c1c4 100644
+index 3e8cd3971ac8256a40d9b85cd7514998c965512c..56ffd7b4d791e5656447d11a47446a4759e775e3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2293,4 +2293,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2295,4 +2295,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0010-AFK-API.patch

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 436c42649395fd6df3425c2ddeb85a99edf9c1c4..e95cd5c57010eb338de48782525635ba64e26399 100644
+index 56ffd7b4d791e5656447d11a47446a4759e775e3..6619d9109089d427e3eaec1f8c18dce23d6b7802 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2301,5 +2301,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2303,5 +2303,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0019-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e95cd5c57010eb338de48782525635ba64e26399..cda1e6a62e80fcca796454828acc3810920cd91c 100644
+index 6619d9109089d427e3eaec1f8c18dce23d6b7802..e6b25b745fa46393fd3ce2949c5336673e552320 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2320,5 +2320,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2322,5 +2322,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0033-Fix-javadoc-warnings-missing-param-and-return.patch

@@ -949,10 +949,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cda1e6a62e80fcca796454828acc3810920cd91c..438819bc40aef25d0cd1d1bfb00cc8191488bb7b 100644
+index e6b25b745fa46393fd3ce2949c5336673e552320..9bbb69ebd6035464da0a5ce8c742054224b53bfc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2115,6 +2115,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2117,6 +2117,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void resetCooldown();
  
      /**
@@ -961,7 +961,7 @@ index cda1e6a62e80fcca796454828acc3810920cd91c..438819bc40aef25d0cd1d1bfb00cc819
       * @return the client option value of the player
       */
      @NotNull
-@@ -2154,6 +2156,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2156,6 +2158,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      // Paper end
  
      // Spigot start

patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch

@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8fad3187f8b1fc099420eef905505cdbab4a9fb7..2306f62a4631fc9969549caa728a95b737796bcb 100644
+index 9bbb69ebd6035464da0a5ce8c742054224b53bfc..c1670adf70a2edcd7ceed1aed7dc223d439489f5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -281,7 +281,7 @@ index 8fad3187f8b1fc099420eef905505cdbab4a9fb7..2306f62a4631fc9969549caa728a95b7
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -1865,7 +1865,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1867,7 +1867,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @deprecated in favour of {@link #locale()}
       */
      @NotNull

patches/api/0043-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a2c7e9bdbb7f9dc6dd51fd0a25f3f51931f80fa5..ed62e194e25a0b981188202be4d9b4c217acbf19 100644
+index c1670adf70a2edcd7ceed1aed7dc223d439489f5..566c8f8b505c3bfc23044a836083a00b92cacedd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2346,5 +2346,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2348,5 +2348,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/server/0005-Purpur-client-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6d2d2ba4a83d887f4d52188305a4a28c2ee2f014..1ee3a4fb960129ba4dae441ad3a4c0217be29972 100644
+index cd4ccb208baebd74780443fc575f0ce5b745fdc8..aaf2d1a0197b38f3945b140b83b201147422f544 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -258,6 +258,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 6d2d2ba4a83d887f4d52188305a4a28c2ee2f014..1ee3a4fb960129ba4dae441ad3a4c021
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 86ff3ee13ac571570965966fc5b2392bb928ffb0..7a7ce8f3ad0bbcbf926718bd46e9dccee08a0778 100644
+index 5d7c47b0a302f7db95a0b2bb811c5656c6b02beb..d75bb089ee91bba87aba51ea95fcfe54b8c0a8ab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3114,6 +3114,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,10 +43,10 @@ index 86ff3ee13ac571570965966fc5b2392bb928ffb0..7a7ce8f3ad0bbcbf926718bd46e9dcce
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1ccbdd2554073a41ca2f37deca3f1ec3e6a0665f..5055945fdf4c0ec6e5ecaf7f865e2e0738c0e021 100644
+index 2b8e31ae00e786dfbfbf5bb5228b846752cd2543..97bb9b65b14dcd85197717f4d8dce6f52c648ef9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2550,4 +2550,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2585,4 +2585,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0006-Component-related-conveniences.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1ee3a4fb960129ba4dae441ad3a4c0217be29972..4d54d474f7d5cc4b3e1530876aa18b916ce4f72c 100644
+index aaf2d1a0197b38f3945b140b83b201147422f544..4ee7255c2bd3ebffdce9a7582b1562a1195607f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1679,6 +1679,26 @@ public class ServerPlayer extends Player {
+@@ -1678,6 +1678,26 @@ public class ServerPlayer extends Player {
      }
      // CraftBukkit end
  
@@ -103,7 +103,7 @@ index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7c
          this.server.sendMessage(message, sender);
          Iterator iterator = this.players.iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 732eb171f6a8fe1b02044a00fcf85217c41116ac..3b7d72f035d7fd74971af043294047ff1ed4c95c 100644
+index 5d455a662107182659abcbe83195ac5d6cf25813..518a8b1e165d49350931dfaefa6cef01729c7f92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3596,6 +3596,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0007-Ridables.patch

@@ -46,7 +46,7 @@ index 416f579560115caddadf6a400b80a4d1d6ebe04c..93d7860c229f78a214b1e89c7b401eac
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4d54d474f7d5cc4b3e1530876aa18b916ce4f72c..d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825 100644
+index 4ee7255c2bd3ebffdce9a7582b1562a1195607f8..6ba8dfbf213bc060eaafe2ea35603a38965d3ff3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -664,6 +664,15 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 4d54d474f7d5cc4b3e1530876aa18b916ce4f72c..d2d2e3c58bd3d08f4e7f6257502ce8c2
      }
  
      public void doTick() {
-@@ -2440,4 +2449,6 @@ public class ServerPlayer extends Player {
+@@ -2439,4 +2448,6 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -73,7 +73,7 @@ index 4d54d474f7d5cc4b3e1530876aa18b916ce4f72c..d2d2e3c58bd3d08f4e7f6257502ce8c2
 +
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7a7ce8f3ad0bbcbf926718bd46e9dccee08a0778..88227a0882b4a667206891b2a26ad5764fd33590 100644
+index d75bb089ee91bba87aba51ea95fcfe54b8c0a8ab..0f86e3896805e2f6a0e30c421522f031bd5219be 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2421,6 +2421,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -5717,10 +5717,10 @@ index 0000000000000000000000000000000000000000..8eefb7b7eb33aecf48ac206d3f0139e0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b4e08dcdf2d94935b58eb90c7ff84511ef525f52..f6b01c77f9af6a824fcb727a9dbae1dd136181d8 100644
+index 2712aa554383a3b2b742c945e2f0be7ee96eea69..f8811514c155f743f6e93c9a88721903fdb1bddd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1250,4 +1250,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1264,4 +1264,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isTicking();
      }
      // Paper end

patches/server/0013-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825..04d2e4e641c12fb259ee7758db81b3544193a2df 100644
+index 6ba8dfbf213bc060eaafe2ea35603a38965d3ff3..20f62a092eb4d37c2502125002fe61d768a65b8a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1954,8 +1954,58 @@ public class ServerPlayer extends Player {
+@@ -1953,8 +1953,58 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -68,7 +68,7 @@ index d2d2e3c58bd3d08f4e7f6257502ce8c2bca19825..04d2e4e641c12fb259ee7758db81b354
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 88227a0882b4a667206891b2a26ad5764fd33590..ecd0fa7daa11cd9f27b2e48cf935a5e92ee5b2f4 100644
+index 0f86e3896805e2f6a0e30c421522f031bd5219be..86d77f244e0abd97480048e28f7bfa5293994086 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -294,6 +294,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -263,7 +263,7 @@ index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf5
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5055945fdf4c0ec6e5ecaf7f865e2e0738c0e021..ee9752ec75a94be33b9f30fd5e0facc5af30ee65 100644
+index 97bb9b65b14dcd85197717f4d8dce6f52c648ef9..34f93861d296fd66758286129be0fb7eebb59011 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -424,10 +424,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -283,7 +283,7 @@ index 5055945fdf4c0ec6e5ecaf7f865e2e0738c0e021..ee9752ec75a94be33b9f30fd5e0facc5
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2556,5 +2561,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2591,5 +2596,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

patches/server/0021-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863da1df6127 100644
+index 20f62a092eb4d37c2502125002fe61d768a65b8a..70c45cc80f1a884edcccf5a104988b196bf35a8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
@@ -24,7 +24,7 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
      }
      // Paper start - Chunk priority
      public BlockPos getPointInFront(double inFront) {
-@@ -977,6 +979,12 @@ public class ServerPlayer extends Player {
+@@ -976,6 +978,12 @@ public class ServerPlayer extends Player {
  
      }
  
@@ -37,7 +37,7 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -984,7 +992,7 @@ public class ServerPlayer extends Player {
+@@ -983,7 +991,7 @@ public class ServerPlayer extends Player {
          } else {
              boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
  
@@ -46,7 +46,7 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
                  return false;
              } else {
                  if (source instanceof EntityDamageSource) {
-@@ -1159,6 +1167,7 @@ public class ServerPlayer extends Player {
+@@ -1158,6 +1166,7 @@ public class ServerPlayer extends Player {
              }
              // Paper end
  
@@ -54,7 +54,7 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
              return this;
          }
      }
-@@ -1944,6 +1953,7 @@ public class ServerPlayer extends Player {
+@@ -1943,6 +1952,7 @@ public class ServerPlayer extends Player {
      }
  
      public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
          this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
      }
  
-@@ -2450,9 +2460,17 @@ public class ServerPlayer extends Player {
+@@ -2449,9 +2459,17 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
@@ -82,7 +82,7 @@ index 04d2e4e641c12fb259ee7758db81b3544193a2df..dafb9dcb3199f217e910a0cd969b863d
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ecd0fa7daa11cd9f27b2e48cf935a5e92ee5b2f4..c69c663d9f569cf15381ed63031a34a5e2ffac7d 100644
+index 86d77f244e0abd97480048e28f7bfa5293994086..89b64a54cb05e341db415c95aaeecf2e1d956419 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1935,12 +1935,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -143,10 +143,10 @@ index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce
  
      public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ee9752ec75a94be33b9f30fd5e0facc5af30ee65..04d178af71fcf353b967c891e4a46835cb731599 100644
+index 34f93861d296fd66758286129be0fb7eebb59011..f8366b1b86d468728a875439bbe3eb4c69639376 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2576,5 +2576,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2611,5 +2611,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

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/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dafb9dcb3199f217e910a0cd969b863da1df6127..b1e1ea0ec16f3fc9b83b8d000024e731e48c7401 100644
+index 70c45cc80f1a884edcccf5a104988b196bf35a8c..9ce1f0bf0962eb7622d8034f325056311d8e6906 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1463,6 +1463,7 @@ public class ServerPlayer extends Player {
+@@ -1462,6 +1462,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void openTextEdit(SignBlockEntity sign) {
@@ -17,7 +17,7 @@ index dafb9dcb3199f217e910a0cd969b863da1df6127..b1e1ea0ec16f3fc9b83b8d000024e731
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 94d526fd0c1e8c68638fdeadf088b70889452d5f..26da5b619dd06f1713da172b6545af289f79cdd9 100644
+index b20b64e217556868dfee0908c2be30bfefe86923..d447030ac544019f34e9f66f7094653d6612bebc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3096,11 +3096,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0050-Minecart-settings-and-WASD-controls.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b1e1ea0ec16f3fc9b83b8d000024e731e48c7401..5f974fec242181729340b6c353dc6b17c3f73837 100644
+index 9ce1f0bf0962eb7622d8034f325056311d8e6906..ad21ea22867b77608e245469438fef9454cd57b5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -990,6 +990,7 @@ public class ServerPlayer extends Player {
+@@ -989,6 +989,7 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5f974fec242181729340b6c353dc6b17c3f73837..bfcd520f5186e61ff601de27aa10b25cf3deea13 100644
+index ad21ea22867b77608e245469438fef9454cd57b5..f5a532d4c9773b46e436fb1341bf404b3919f6ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2520,5 +2520,25 @@ public class ServerPlayer extends Player {
+@@ -2519,5 +2519,25 @@ public class ServerPlayer extends Player {
      }
      // CraftBukkit end
  
@@ -35,7 +35,7 @@ index 5f974fec242181729340b6c353dc6b17c3f73837..bfcd520f5186e61ff601de27aa10b25c
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d08a9032a0551361e5ced4fe20cf803d68898665..8896f8aa3f21dba3fe78b5cf6f3ee1adfac2bac3 100644
+index a0e9c17662682394168ffbaf8111121c0211e679..2107c20a6bd7eeac17ac0ca41721f60acbbed701 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -45,6 +45,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;

patches/server/0130-Add-boat-fall-damage-config.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bfcd520f5186e61ff601de27aa10b25cf3deea13..708544ba328bab7a5eb9f4860eccb32258c6ee04 100644
+index f5a532d4c9773b46e436fb1341bf404b3919f6ee..126d06f0cd59e8e1298caf6cb8f8da15a691f34c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -990,7 +990,16 @@ public class ServerPlayer extends Player {
+@@ -989,7 +989,16 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

patches/server/0141-Implement-TPSBar.patch

@@ -17,7 +17,7 @@ index 42deff516bd363d0882b441fa6928ac7eecbfccc..386e9ad013369633e2be543b9281e5a5
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5f1f6c43a155956298ac57acf54773728cb1215b..dd4be57611028acde485bc03640e83e07b0bd34f 100644
+index 9592e3c54da1fddd5a9c199c210f9d2780da1f1d..e22efbd106191d6c478cc2d9fb983dbea0dfa7c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1134,6 +1134,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,7 +29,7 @@ index 5f1f6c43a155956298ac57acf54773728cb1215b..dd4be57611028acde485bc03640e83e0
          this.hasLoggedStop = true; // Paper
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index ef0d4086af9a05bf5f0dd1eae965e496b1de6199..c7db9d6357935c6004867ded2b422f8a2b4a6668 100644
+index 4807731e3e4d0725446a9f0e589c6b7527de9cf4..5f1da3130fd01fb52f709392dedb9eea64084cb5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -350,6 +350,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -42,7 +42,7 @@ index ef0d4086af9a05bf5f0dd1eae965e496b1de6199..c7db9d6357935c6004867ded2b422f8a
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 708544ba328bab7a5eb9f4860eccb32258c6ee04..33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee 100644
+index 126d06f0cd59e8e1298caf6cb8f8da15a691f34c..29aa0e8fc9228cc28b65f06e6c94186fa7bca24e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -69,7 +69,7 @@ index 708544ba328bab7a5eb9f4860eccb32258c6ee04..33543cb967d3e90e3f8269c6e6c8c024
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2549,5 +2552,13 @@ public class ServerPlayer extends Player {
+@@ -2548,5 +2551,13 @@ public class ServerPlayer extends Player {
              this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
          }
      }
@@ -105,7 +105,7 @@ index e17c61e3b807dbc1a7bca4952349145617204154..cf016f139895690d5a0e0ef2709e31ea
  
          entityplayer.awardStat(Stats.LEAVE_GAME);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9494d94abbe352d275ed39070dbc59d8650a0ed7..16a7808f0ad010240db8a33eccc61b623ccd3d76 100644
+index defd23f85fb0e67511ee93f7f9c00cfceb71c484..039c5e6d98228837f7818803641656d566e416f5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -209,6 +209,29 @@ public class PurpurConfig {

patches/server/0148-Add-EntityTeleportHinderedEvent.patch

@@ -98,10 +98,10 @@ index c9fb98c7aacf0745ee5f008629ebfe2d117f664d..58812794be7c3676fa527cdeb8e48e24
          noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
          persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a96657ce0262 100644
+index f8811514c155f743f6e93c9a88721903fdb1bddd..501f9310bdc13b6d38dcdda4ad7fdfd19216d6e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -561,6 +561,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -562,6 +562,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          location.checkFinite();
  
          if (this.entity.isVehicle() || this.entity.isRemoved()) {
@@ -113,7 +113,7 @@ index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a966
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac..86cc5b5ef6bb8bfeaf9ee4436790f8f8e3faf018 100644
+index acca95dbf81a5c8fcffc496431dd65579d323701..2aab21f43e3c5564d1970be7a98a08e2a68d10a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1009,6 +1009,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0152-Fix-stuck-in-portals.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee..64c5a9900121ee5c369affa723de2c5f3433bc29 100644
+index 29aa0e8fc9228cc28b65f06e6c94186fa7bca24e..4b90ebeae7dccef28dc7fca101d5e82cfde9ee70 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1143,6 +1143,7 @@ public class ServerPlayer extends Player {
+@@ -1142,6 +1142,7 @@ public class ServerPlayer extends Player {
                  playerlist.sendPlayerPermissionLevel(this);
                  worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
                  this.unsetRemoved();
@@ -17,7 +17,7 @@ index 33543cb967d3e90e3f8269c6e6c8c024b9a0e1ee..64c5a9900121ee5c369affa723de2c5f
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3ad67d65990feaedbb67ed15fe50032c0fd0fdc2..3c5d34e82154c68bb5ac9472d3826962a28fcd60 100644
+index 164b4458d1ae4c80ffc7f6e1664823f18ca1d547..f57da36a94adf54e4ca138ac9d8e9414c883e45e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2729,12 +2729,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -37,7 +37,7 @@ index 3ad67d65990feaedbb67ed15fe50032c0fd0fdc2..3c5d34e82154c68bb5ac9472d3826962
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6a4170e60bf845ac33a7f65c0082617da584f99d..60ff59cfbd5e748a6899fdbee4e06d7a01eff115 100644
+index 96d51a8ae4f42b257b74945cf66492c908b8d0e9..65a022cd14063f3f0692f92bb7a2147c748b0fb4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -297,6 +297,7 @@ public class PurpurWorldConfig {

patches/server/0156-Add-unsafe-Entity-serialization-API.patch

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5a12ca0a556da2d67f58dcb2466eafe5237671db..b290df0ac4951abeade7b6b038fe5f963060d425 100644
+index 501f9310bdc13b6d38dcdda4ad7fdfd19216d6e6..5ae88a924b2f2cfd714bd693eebc708e7c029ee8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1276,5 +1276,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1290,5 +1290,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isRidableInWater() {
          return getHandle().rideableUnderWater();
      }

patches/server/0162-Config-to-ignore-nearby-mobs-when-sleeping.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 64c5a9900121ee5c369affa723de2c5f3433bc29..f83e5b3ee2489b4dd35f856a1262972939eb71cf 100644
+index 4b90ebeae7dccef28dc7fca101d5e82cfde9ee70..71542d8f5f25485e99682470264c619e7d52bebf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1306,7 +1306,7 @@ public class ServerPlayer extends Player {
+@@ -1305,7 +1305,7 @@ public class ServerPlayer extends Player {
                              return entitymonster.isPreventingPlayerRest((Player) this);
                          });
  
@@ -18,7 +18,7 @@ index 64c5a9900121ee5c369affa723de2c5f3433bc29..f83e5b3ee2489b4dd35f856a12629729
                          }
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 16d8181614fd7ffaf682438d3fb348c133a82620..846cd0e6509b662fc2ace83939a96a9f17a696ae 100644
+index ddb2733fc4a23fa480cdb708e4ebab9b6e827a43..54e276877fe4ba5180fff54485561792301bf8b1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -311,6 +311,7 @@ public class PurpurWorldConfig {

patches/server/0204-API-for-any-mob-to-burn-daylight.patch

@@ -333,10 +333,10 @@ index 1f90c40c5e92232c38a33097903fd6e2f6f2ff02..39fa4a9a52c510e88036ab790a8739d2
          // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b290df0ac4951abeade7b6b038fe5f963060d425..f42cba9262902c9e3940464418e73fcc8d9e0627 100644
+index 5ae88a924b2f2cfd714bd693eebc708e7c029ee8..b75661886bafcfa340c5ac388401aa3c1cda78a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1283,5 +1283,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1297,5 +1297,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.absMoveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
          return !entity.valid && entity.level.addEntity(entity, spawnReason);
      }

patches/server/0210-Flying-Fall-Damage-API.patch

@@ -26,10 +26,10 @@ index b7e8ba03bd46b257ec97a494c4e7a20d0286a5dd..b0661f7ad41157c5e25ee2d87f9a0efd
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 86cc5b5ef6bb8bfeaf9ee4436790f8f8e3faf018..6f52f6c3bce625cc6a2031b03f04777400fa5f79 100644
+index 2aab21f43e3c5564d1970be7a98a08e2a68d10a8..282a2ac98e19f4ead2307e464fcfbd258a262324 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2601,5 +2601,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2636,5 +2636,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0234-Add-compass-command.patch

@@ -17,7 +17,7 @@ index 48a70900082c6c2c99c955a6ac40b48859a74979..8c2424b0917d278bb0b9e687d116d8de
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b599607d616f9faf209f1a4491dd3fcfd49a6126..0cb58f2a5607664193adddbfd7e43384c5a44862 100644
+index a961987c01a59e6f37c79bac6ecbe94e62fc8721..8f421cc6838455ffdc54614e7020cb510bc4c182 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index b599607d616f9faf209f1a4491dd3fcfd49a6126..0cb58f2a5607664193adddbfd7e43384
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2562,5 +2565,13 @@ public class ServerPlayer extends Player {
+@@ -2561,5 +2564,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }
@@ -81,7 +81,7 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..046bf9cbf02b002e89f7d39b616dd0f5
                  CompoundTag compoundTag = stack.getOrCreateTag();
                  if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6f992bd9b1e35dbd712d64daa0e0b8d5b4f85ec5..babd56746ea83c7387f17a7c191d1b878c8b5d12 100644
+index 1c27d959bb4caeb6af331f4e240d9ef10454b475..15963a7d4d721f3a8b665c1917cd5f2860814a62 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -252,6 +252,11 @@ public class PurpurConfig {
@@ -111,7 +111,7 @@ index 6f992bd9b1e35dbd712d64daa0e0b8d5b4f85ec5..babd56746ea83c7387f17a7c191d1b87
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
          uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ec9a56a4acf191e24c10af815216cdba5afd220c..a8a8821a7a79ea5b429ca1b7e8b56a10b8869e02 100644
+index 4086b6b30b78caa62f370f616213556e04a8e1fc..bed9d3397aea378274c4d9aa427d07bd8671325c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -176,6 +176,7 @@ public class PurpurWorldConfig {