Purpur client stuffs

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

@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Fri, 30 Jul 2021 14:31:25 -0500
+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 1c9aec21aa22d0d202a023e9252d1412685ed4b0..0f87a808432e46174d3494d92f2b1a5e7f663b1a 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 {
+     public Integer clientViewDistance;
+     // CraftBukkit end
+     public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
++    public boolean purpurClient = false; // Purpur
+ 
+     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 c4cea533f619624976c4d1290312ed1a6b250855..f0da340879f10d23b2d02e238ec944739390986e 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3104,6 +3104,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+     private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
+ 
+     private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
++    private static final ResourceLocation PURPUR_CLIENT = new ResourceLocation("purpur", "client"); // Purpur
+ 
+     @Override
+     public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
+@@ -3128,6 +3129,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+                 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
+                 this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
+             }
++        // Purpur start
++        } else if (packet.identifier.equals(PURPUR_CLIENT)) {
++            try {
++                player.purpurClient = true;
++            } catch (Exception ignore) {
++            }
++        // Purpur end
+         } else {
+             try {
+                 byte[] data = new byte[packet.data.readableBytes()];

patches/server/0005-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 dcba69c0ad3288ddc64dacc58b6fb857eed3109c..57200e6b419ab0793df6498467325b6d5690c17f 100644
+index 0f87a808432e46174d3494d92f2b1a5e7f663b1a..2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1673,6 +1673,26 @@ public class ServerPlayer extends Player {
+@@ -1674,6 +1674,26 @@ public class ServerPlayer extends Player {
      }
      // CraftBukkit end
  
@@ -103,7 +103,7 @@ index 936ae5576902e6593bd21af4d3cf3998109347b5..6cb325b098fe64b746940ce79fd92732
          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 d9265426ddb91a6cff634b8fcc3ed26072379f43..3d50e17f13a9c9678b8d912f874096fbd28a42ee 100644
+index 2453492429a743677db07e31d575c1473fedf4ad..28d7e18c9b53b7563b9c4af9afde4e1261d454e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3565,6 +3565,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0006-Ridables.patch

@@ -46,10 +46,10 @@ index f9ed48f5bbde84fd1804e482f2777b516cc3a1ef..29b841462037fa97f72971c490b617d1
          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 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d34b625cec 100644
+index 2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd..53806589d0138e43e50c4ca7c1e6fc9a3317d38c 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 {
+@@ -665,6 +665,15 @@ public class ServerPlayer extends Player {
          }
  
          this.advancements.flushDirty(this);
@@ -65,7 +65,7 @@ index 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d3
      }
  
      public void doTick() {
-@@ -2410,4 +2419,6 @@ public class ServerPlayer extends Player {
+@@ -2411,4 +2420,6 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -73,7 +73,7 @@ index 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d3
 +
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b5b1aab39f881c334aa7f5f0d713f78f7265f41b..757c9f9800de18ca8ece3583222c7d3a765f3bde 100644
+index f0da340879f10d23b2d02e238ec944739390986e..a0f529180ecd641fc4484d4afe3153ce39314285 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2412,6 +2412,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -4528,7 +4528,7 @@ index 37356b36f0ae12d55150f399318581fa77c30cee..4e667be589fd95eb61e57a99448939a9
  
      Projectile(EntityType<? extends Projectile> type, Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d0d87fcca78ea5c7853d693bc617c2bd6cfed487..773e42ff93e01b9f2db41dc4e8273525c5c162dc 100644
+index faa4ad6af45ce1ef62084194340c6789634bff5f..ad7dbfa8dd5f38af87ec8980fd972ea4449da7ed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -156,4 +156,9 @@ public class PurpurConfig {
@@ -5752,7 +5752,7 @@ index 8ce49478441e77cedf5148ecb81d78b32660329e..fb5cd6fe7903f3f96af1abb55832bafb
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ec00da61e422384276442fa23e496dc078f49d1a..0238bea72b9d4d6b92a03ec59c8697cbe88dbf5a 100644
+index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6d4eaa498 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -537,6 +537,15 @@ public class CraftEventFactory {

patches/server/0011-Llama-API.patch

@@ -25,7 +25,7 @@ index e037d618955de9a213a9cd90752b29d189faace4..34dec0a94840a8865f1d80857ec54a10
              double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
              if (d > 676.0D) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 397d9846ad645f98163a0bfae7a69ceaa6d5c3a4..92069543fd8f19ee037af59edd84c61f5216463f 100644
+index d664be25c2c2c527a44fa939e68e84d60effc144..5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -65,6 +65,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {

patches/server/0012-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 ac44d1c07ba6922d25592d750af326d34b625cec..0b0f4c1c53a575144206db9690855595c4f7003c 100644
+index 53806589d0138e43e50c4ca7c1e6fc9a3317d38c..a0d2480021b5cb4ae7e28d25869d78209a6096c2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1948,8 +1948,58 @@ public class ServerPlayer extends Player {
+@@ -1949,8 +1949,58 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -68,7 +68,7 @@ index ac44d1c07ba6922d25592d750af326d34b625cec..0b0f4c1c53a575144206db9690855595
          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 757c9f9800de18ca8ece3583222c7d3a765f3bde..65fb15671ed2947bc62753bc685656732a96feff 100644
+index a0f529180ecd641fc4484d4afe3153ce39314285..c6ef86206fc498a0fcd1c1527516d98e00a5df40 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,6 +390,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -43,7 +43,7 @@ index ac99265aacd4a28490705e3079ed04023fb1c54a..01f27e4aee9e257c632e9e163e495443
          if (this.descriptionId == null) {
              this.descriptionId = Util.makeDescriptionId("entity", Registry.ENTITY_TYPE.getKey(this));
 diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
-index ab7e4780529a88183600f3d3860e882bbe3a1754..fbe131ac0381c89cd297b5c2f7519f81aa565440 100644
+index 6afba641943717cc9c75420d9f3af1048543a17e..45e964a15a8afb85dd91638e800beaf0a6efdde9 100644
 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
 @@ -68,6 +68,15 @@ public class SpawnEggItem extends Item {

patches/server/0020-Player-invulnerabilities.patch

@@ -5,18 +5,18 @@ 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 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86bddf88d3 100644
+index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e25a6a344 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 {
-     public Integer clientViewDistance;
+@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
+     public boolean purpurClient = false; // Purpur
 +    public boolean acceptingResourcePack = false; // Purpur
  
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
-@@ -334,6 +335,7 @@ public class ServerPlayer extends Player {
+@@ -335,6 +336,7 @@ public class ServerPlayer extends Player {
          this.bukkitPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
      }
      // Paper start - Chunk priority
      public BlockPos getPointInFront(double inFront) {
-@@ -975,6 +977,12 @@ public class ServerPlayer extends Player {
+@@ -976,6 +978,12 @@ public class ServerPlayer extends Player {
  
      }
  
@@ -37,7 +37,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
      @Override
      public boolean hurt(DamageSource source, float amount) {
          if (this.isInvulnerableTo(source)) {
-@@ -982,7 +990,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 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
                  return false;
              } else {
                  if (source instanceof EntityDamageSource) {
-@@ -1157,6 +1165,7 @@ public class ServerPlayer extends Player {
+@@ -1158,6 +1166,7 @@ public class ServerPlayer extends Player {
              }
              // Paper end
  
@@ -54,7 +54,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
              return this;
          }
      }
-@@ -1938,6 +1947,7 @@ public class ServerPlayer extends Player {
+@@ -1939,6 +1948,7 @@ public class ServerPlayer extends Player {
      }
  
      public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
          this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
      }
  
-@@ -2421,9 +2431,17 @@ public class ServerPlayer extends Player {
+@@ -2422,9 +2432,17 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
@@ -82,7 +82,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
      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 65fb15671ed2947bc62753bc685656732a96feff..858a0402a22e3c52d88b976bb513d0f82a60d114 100644
+index c6ef86206fc498a0fcd1c1527516d98e00a5df40..5ae1002dde94a242fd6c19bb22a52416eba229f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -141,7 +141,7 @@ index dc3dcf7946d2b31784b31d31c01670b81e626eed..b1b2e96804eb9e736e634a75882dc404
  
      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 d18a46745a82a758a3709ffa1de4b81bf4b75766..1d074ecc76eaf1ae10a6bd35b2f2a54f6654260e 100644
+index 5c9aa0e2e5a9e6a671fdc8d51f94529736b6dbbf..e9b440d1ec4a0c8155c80ee88e76b462a1bfdb06 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2565,5 +2565,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 858a0402a22e3c52d88b976bb513d0f82a60d114..4bc387482dfcecea079257e65e933ecd78951adc 100644
+index 5ae1002dde94a242fd6c19bb22a52416eba229f2..2f8bae1e9d744a28ec3fc0409622d4d500b8e2ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0026-Fix-vanilla-command-permission-handler.patch

@@ -17,7 +17,7 @@ index 39708be1b445791b053023dec16ad7d4efcc9048..797c0c86c4a99e1608106881be849a33
      public void removeCommand(String name) {
          this.children.remove(name);
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 2311819fc944c3ddb76efe59fd2920d4aca6b490..25c3fbc310f8f0292b26766601226531ad1200f4 100644
+index 0377c706c9aec6f367e83f859f9a3432ad5bba4a..96691990aa3ede953e41df6e3b36bb1eb1e3fd13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {

patches/server/0030-Zombie-horse-naturally-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7c45fdbd9f389e8b74de5a672a9520ede93d6217..d53497ca3ada4c1205695f54dd7e163f3cc63afb 100644
+index 29b841462037fa97f72971c490b617d18be53160..fe963c666488a8a3463f855b0c87eee997f7a103 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -856,9 +856,15 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0037-Chickens-can-retaliate.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Chickens can retaliate
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 55dccf338f9fba17fbcb88672d36b83e7bbec88b..eaec6eba96db3b8ce046208a4a1e5fc4b26b7dcc 100644
+index 9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e..35cf6b9fb4d72df905d93bf52c02846b21b04007 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -66,6 +66,9 @@ public class Chicken extends Animal {

patches/server/0047-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 efa6e02ae06e70f554f21468ec3c2e86bddf88d3..d3277ade753b889ba4420ad68e3539d2f81699f2 100644
+index a53e68deb6b5fb9c43bce9444373b68e25a6a344..349aac496cf51f0a837d032d509364c13cece6ca 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1461,6 +1461,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 efa6e02ae06e70f554f21468ec3c2e86bddf88d3..d3277ade753b889ba4420ad68e3539d2
          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 b9fc450c548e20d1f9763d993f3818235bec4bdb..0881cddd2a4c382b1d7113fe11a1c6a88be961bc 100644
+index 2f8bae1e9d744a28ec3fc0409622d4d500b8e2ca..cfc4bf12b9a276fc4b7a58638c577c978d63e2eb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3072,11 +3072,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0049-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 d3277ade753b889ba4420ad68e3539d2f81699f2..394da2bb29809477351da3cb782bf5b8e3aadc3b 100644
+index 349aac496cf51f0a837d032d509364c13cece6ca..edaff3eb46fd1de456acbc465d644ac9454022d3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -988,6 +988,7 @@ public class ServerPlayer extends Player {
+@@ -989,6 +989,7 @@ public class ServerPlayer extends Player {
          if (this.isInvulnerableTo(source)) {
              return false;
          } else {

patches/server/0053-Fix-the-dead-lagging-the-server.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1d6e063e1cf5435b123d5789d7fcf03503cc0821..46b6e0fcf662472b7fcccc33f859c5e33340d7bb 100644
+index 9b6ee1fc3fd17faf2c2be56c0c292b1d5f98e0fa..24f4c130a539b3a42bf13f9bd4d264f9c84dec3b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0065-Configurable-void-damage-height-and-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 46b6e0fcf662472b7fcccc33f859c5e33340d7bb..5a23bc98f38e715ee16abe9a370b044e928b2d03 100644
+index 24f4c130a539b3a42bf13f9bd4d264f9c84dec3b..ad8497df1b0410989afd22d65e6afd0e72b0926f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0066-Add-canSaveToDisk-to-Entity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5a23bc98f38e715ee16abe9a370b044e928b2d03..6db330cf388ef80f3acb84e41f02063c36f9aaf2 100644
+index ad8497df1b0410989afd22d65e6afd0e72b0926f..35de254dfb565b75286fc130573b8d788dce1982 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4264,5 +4264,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -35,7 +35,7 @@ index f52420f27f51d9dbf214f96a0530c0f17f2bc5fc..12cd1b453150e098975c34e00ec9277f
          skull.setPosRaw(headX, headY, headZ);
          level.addFreshEntity(skull);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
-index 69ac9ed94b1890f9bd5ba21cdfe31e42529274e1..7ee8272b40d5c1dcd45a948e1a72063c8106ea5f 100644
+index 396c34c0866bf395b4d86361d96fe103c5d9ae7e..320291b611cbb243a54ea882b16d70d061d21492 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java
 @@ -92,6 +92,7 @@ public class EntityStorage implements EntityPersistentStorage<Entity> {

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

@@ -31,7 +31,7 @@ index b7116c40b22c4c614ba74232a18c216da8cba94c..f9c37b2ca0d1b8415dc32127650f449e
      public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
          this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7fbbfccf90 100644
+index 158719d46c96bb733a00e08c8285f41a48406abf..22d5f7e543461461ba0560f3fcfb769a8f082dce 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -53,6 +53,12 @@ public class ItemEntity extends Entity {
@@ -77,7 +77,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
      }
  
      @Override
-@@ -594,4 +616,15 @@ public class ItemEntity extends Entity {
+@@ -594,4 +616,17 @@ public class ItemEntity extends Entity {
      public SoundSource getSoundSource() {
          return SoundSource.AMBIENT;
      }
@@ -87,8 +87,10 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
 +        Packet<?> spawnPacket = new ClientboundAddEntityPacket(this);
 +        Packet<?> metadataPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket(getId(), getEntityData(), true);
 +        for (net.minecraft.server.network.ServerPlayerConnection connection : this.tracker.serverEntity.trackedPlayers) {
-+            connection.send(spawnPacket);
-+            connection.send(metadataPacket);
++            if (!connection.getPlayer().purpurClient) {
++                connection.send(spawnPacket);
++                connection.send(metadataPacket);
++            }
 +        }
 +    }
 +    // Purpur end

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

@@ -17,7 +17,7 @@ index 59881c845cc88508736cc3d2a61860512d28964d..3a1e1ff3c9154db6b1b23d1898c8e6ec
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 66745b2c1c38391779abb496933c74466379aef2..cf3d30f19a6184686ea224e976dd14dfab5db101 100644
+index 03b88ddc349fc7cfa48573ec93c22cd9cef3b58d..8f84848950c2bab5123766edd6131e98be97a92a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -162,12 +162,14 @@ public class PurpurConfig {

patches/server/0074-Add-demo-command.patch

@@ -17,7 +17,7 @@ index 3a1e1ff3c9154db6b1b23d1898c8e6ec198f103f..880efd832a2029bdb7a404e27797b316
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index cf3d30f19a6184686ea224e976dd14dfab5db101..2f5ee21b94c3f0fbe1febf0b8878b35aef88dae0 100644
+index 8f84848950c2bab5123766edd6131e98be97a92a..72cfd435cc68ee42ea28b0afc5b42c75e1e2813a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -162,6 +162,7 @@ public class PurpurConfig {

patches/server/0075-Add-credits-command.patch

@@ -17,7 +17,7 @@ index 880efd832a2029bdb7a404e27797b316cbbe5703..a5712108fbbe5ddc61cdfd390f667ab0
              net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2f5ee21b94c3f0fbe1febf0b8878b35aef88dae0..4950ade071fb401326aeb4075f5a2a5ab65d4d52 100644
+index 72cfd435cc68ee42ea28b0afc5b42c75e1e2813a..35be2f773d33b1c13f8732217c5520b384305b18 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -162,6 +162,7 @@ public class PurpurConfig {

patches/server/0076-Configurable-jockey-options.patch

@@ -57,7 +57,7 @@ index 464e062bba03a17c9281b3dfb8fa9193c1b81150..6c89eabddda16f9b72e6062c31bb4be6
  
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 3b7e261eae87445387f5a34d6fbb420c4cd0cf0f..f6e33ca1933792a3a417f54d20fea8dc4a41c1b5 100644
+index c3288e6a5be2c0805067fe14496315afd6156110..1f9a233799be988748f6146ced2a4489899079f8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -122,6 +122,18 @@ public class Zombie extends Monster {
@@ -115,7 +115,7 @@ index 3b7e261eae87445387f5a34d6fbb420c4cd0cf0f..f6e33ca1933792a3a417f54d20fea8dc
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index ce15ebc6248eaa849ccb1de4319b51e8a12f2e3e..8c71bf52cebf4b7825c770b120e6ac7b2ee916fb 100644
+index 9c60e3b3e62a29d6898c82a4110ffd4d1c7cb5f2..7fda07f5fa756077dab59de95f15b9197e09581a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -94,6 +94,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0fbf66540e6beee964096a8f2a0312509449ff14..547572a579c434055956eab627195dbb5e5d4fa8 100644
+index cfc4bf12b9a276fc4b7a58638c577c978d63e2eb..a4e38e61138b2bfeee30a76e1f0e199d79bedfe9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1200,13 +1200,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0084-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 92be3472f97a8d3e916af198c1278773aa1b7d3a..074abae3d83c3f170b1d4e5134a204c7acdc49bc 100644
+index edaff3eb46fd1de456acbc465d644ac9454022d3..48bad15686c38c02d2c933c6360edf7a90950039 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2490,5 +2490,25 @@ public class ServerPlayer extends Player {
+@@ -2491,5 +2491,25 @@ public class ServerPlayer extends Player {
      }
      // CraftBukkit end
  

patches/server/0086-Configurable-feature-seed-settings.patch

@@ -835,7 +835,7 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756
              return false;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 86f4f92ee15fa2320da0a75bb515e711315aa3a9..85f323b2b1be900ee1d7416b5dd9877bbb282460 100644
+index 3bfddb1111f543a5badb26ca52b4dcef32a7cf1a..f8aeba21a04bcf3cc6c63bcf99ea3b5c2773741a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -176,6 +176,128 @@ public class PurpurConfig {

patches/server/0095-Add-no-random-tick-block-list.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add no-random-tick block list
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d53497ca3ada4c1205695f54dd7e163f3cc63afb..5316b5e9bfe57caed88a3ff38715e67ffd59df33 100644
+index fe963c666488a8a3463f855b0c87eee997f7a103..7284003a17e8059c3c3ab8a2c8a62b0f53f48ac4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -483,7 +483,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0098-Stop-squids-floating-on-top-of-water.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6db330cf388ef80f3acb84e41f02063c36f9aaf2..c5a1e46cc01e0f296a02536e70dc1443bb23a26f 100644
+index 35de254dfb565b75286fc130573b8d788dce1982..d3541a447d7fcee70733ce9b18f4c5abdc4ba55a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3829,11 +3829,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n

patches/server/0101-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c5a1e46cc01e0f296a02536e70dc1443bb23a26f..63ab08c00048feba74e4b3c25308ee75d2aa8474 100644
+index d3541a447d7fcee70733ce9b18f4c5abdc4ba55a..af932a7149153a295c52efb7d7ea6da9a936b4ea 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2701,7 +2701,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n