Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: 871f30038 fixed kick event leave message (#4766) 0aa0a1d97 Updated Upstream (CraftBukkit) d770f71f4 Add PlayerArmSwingEvent (#5353) 23d887b2a Swapped out Vec3#distanceTo call with a Vec3#distanceToSqr call to remove calls to Math.sqrt 5ff90b938 Fix collisions during world generation (#6129) 20ff0b058 [ci skip] Add a test plugin (#6133) 416ec9898 [ci skip] Remove extra newlines at EOF (#6127) 79d7dfbbe Ensure shulker bounding box is updated (#6010) d8ad276b7 [ci skip] More badges and things to README.md (#5338) bb44da842 Fix cancelling EntityPickupItemEvent for villagers (#6091) 351a2c38b Drop no longer needed patch (#6115) 648f6078d Route sign run_command click events through normal chat logic (#6109) dafc06460 Fix MobEffectArgument#getEffect reobf 4aef0354d [ci skip] Use Java toolchain for run tasks (#6108) 144e5f7ac Add option for logging named entity deaths (#6107) b5be382d0 Add methods to `ProtoWorld` for working with `BlockState`s (#5929)
2026-02-17 16:37:43 +01:00 · 2021-07-09 16:56:56 -05:00
parent 444413bba6
commit 325d6c39a4
15 changed files with 55 additions and 55 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1

-paperCommit = bb44da8420a5300c53e63843da8e7bb44cf45d2a
+paperCommit = 871f30038e07e9d290f706724f3b3bb0423942e0

 org.gradle.parallel = true
 org.gradle.vfs.watch = false
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -17,7 +17,7 @@ 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/build.gradle.kts b/build.gradle.kts
-index 4605634d1e0d2c6592d4152e697680e078380868..bc85e4da98322426f3f4a784fafe1c96eaea00f5 100644
+index 2929ead9f8a2edd657ce63326d7f1e327ca99cc3..dbc5fee27ed27c1a563a03fba3a65a7fd2dd9781 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
@@ -1,10 +1,16 @@
@@ -14161,7 +14161,7 @@ index 0f6b534a4c789a2f09f6c4624e5d58b99c7ed0e6..fea852674098fe411841d8e5ebeace7d
         this.generatingStatus = chunkstatus;
         this.writeRadiusCutoff = i;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6ff04fc7202a7eb1f2b5978a2e2a573945d9dde1..53e9ba24338690b1c5f12250748273758c68f4d1 100644
+index 098e221d61a8279a4d2eb67ac3fe9ded9b63d322..733ba23aa8f8d84eba556604fd743449a313a659 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -536,6 +536,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -14443,7 +14443,7 @@ index 61405c2b53e03a4b83e2c70c6e4d3739ca9676cb..1f307f8e3f0f484dad33e9af085dabd9
 
     private static JsonElement writeGameProfile(GameProfileCache.GameProfileInfo entry, DateFormat dateFormat) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 65657c009f6d5a5d5740e80f912a5893333c7085..2fd0a432ed52ca137622a1f631e886aaf77f33d3 100644
+index 48045993c8ad4b014cf4a67f7c4db42e014d1c81..936ae5576902e6593bd21af4d3cf3998109347b5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -177,6 +177,7 @@ public abstract class PlayerList {
@@ -14463,7 +14463,7 @@ index 65657c009f6d5a5d5740e80f912a5893333c7085..2fd0a432ed52ca137622a1f631e886aa
         player.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
         playerconnection.send(new ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.BRAND, (new FriendlyByteBuf(Unpooled.buffer())).writeUtf(this.getServer().getServerModName())));
         playerconnection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-@@ -725,7 +726,7 @@ public abstract class PlayerList {
+@@ -730,7 +731,7 @@ public abstract class PlayerList {
         SocketAddress socketaddress = loginlistener.connection.getRemoteAddress();
 
         ServerPlayer entity = new ServerPlayer(this.server, this.server.getLevel(Level.OVERWORLD), gameprofile);
@@ -14472,7 +14472,7 @@ index 65657c009f6d5a5d5740e80f912a5893333c7085..2fd0a432ed52ca137622a1f631e886aa
         Player player = entity.getBukkitEntity();
         PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.connection.getRawAddress()).getAddress());
 
-@@ -929,13 +930,13 @@ public abstract class PlayerList {
+@@ -934,13 +935,13 @@ public abstract class PlayerList {
 
         worldserver1.getChunkSource().addRegionTicket(net.minecraft.server.level.TicketType.POST_TELEPORT, new net.minecraft.world.level.ChunkPos(location.getBlockX() >> 4, location.getBlockZ() >> 4), 1, entityplayer.getId()); // Paper
         entityplayer1.forceCheckHighPriority(); // Player - Chunk priority
@@ -14488,7 +14488,7 @@ index 65657c009f6d5a5d5740e80f912a5893333c7085..2fd0a432ed52ca137622a1f631e886aa
         entityplayer1.setLevel(worldserver1);
         entityplayer1.unsetRemoved();
         entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
-@@ -1210,7 +1211,7 @@ public abstract class PlayerList {
+@@ -1215,7 +1216,7 @@ public abstract class PlayerList {
             // Really shouldn't happen...
             backingSet = world != null ? world.players.toArray() : players.toArray();
         } else {
@@ -14585,7 +14585,7 @@ index 020a19cd683dd3779c5116d12b3cdcd3b3ca69b4..17d209c347b07acef451180c97835f41
     public static final Codec<IntProvider> POSITIVE_CODEC = codec(1, Integer.MAX_VALUE);
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5ffc9d02ee10e9efe653e124b1eb9cbd0adc3df9..e75efd67acb063e3ce7506839e4a888241bda703 100644
+index a11507c630248b98153275f78c15ebee59a6b0a3..d9265426ddb91a6cff634b8fcc3ed26072379f43 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -356,8 +356,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -14928,8 +14928,8 @@ index 5ffc9d02ee10e9efe653e124b1eb9cbd0adc3df9..e75efd67acb063e3ce7506839e4a8882
     }
 
     public void setDeltaMovement(double x, double y, double z) {
-@@ -3789,7 +3980,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     public final void setPosRaw(double x, double y, double z) {
+@@ -3794,7 +3985,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+         // Paper end
         // Paper start - fix MC-4
         if (this instanceof ItemEntity) {
 -            if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) {
@@ -14937,9 +14937,9 @@ index 5ffc9d02ee10e9efe653e124b1eb9cbd0adc3df9..e75efd67acb063e3ce7506839e4a8882
                 // encode/decode from PacketPlayOutEntity
                 x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
                 y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
-@@ -3804,7 +3995,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3803,7 +3994,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
         }
-         // Paper end
+         // Paper end - fix MC-4
         if (this.position.x != x || this.position.y != y || this.position.z != z) {
 +            synchronized (this.posLock) { // Tuinity
             this.position = new Vec3(x, y, z);
@@ -15599,10 +15599,10 @@ index 2a784a8342e708e0813c7076a2ca8e429446ffd3..b909bd7bf10adc9165df49a210df0d73
 
     Stream<VoxelShape> getEntityCollisions(@Nullable Entity entity, AABB box, Predicate<Entity> predicate);
 diff --git a/src/main/java/net/minecraft/world/level/CollisionSpliterator.java b/src/main/java/net/minecraft/world/level/CollisionSpliterator.java
-index e420c98d9ccc45d570984dc30fdb928883edec9f..ac83704692cf60c34b579ed11689863ef191cad3 100644
+index 6124e3a32325e8c74bf839010a79d7c82c49aaff..56053b158127150fcd1fba4b6970a52e9bb38db6 100644
 --- a/src/main/java/net/minecraft/world/level/CollisionSpliterator.java
 +++ b/src/main/java/net/minecraft/world/level/CollisionSpliterator.java
-@@ -99,7 +99,7 @@ public class CollisionSpliterator extends AbstractSpliterator<VoxelShape> {
+@@ -106,7 +106,7 @@ public class CollisionSpliterator extends AbstractSpliterator<VoxelShape> {
 
                 VoxelShape voxelShape = blockState.getCollisionShape(this.collisionGetter, this.pos, this.context);
                 if (voxelShape == Shapes.block()) {
@@ -15932,7 +15932,7 @@ index 474078b68f1bf22037495f42bae59b790fd8cb46..61a4dea715689b0ce9247040db5dd208
 
     public boolean noSave() {
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 31fbcf6a35b902ce80c0a5a23dabb8ec3d8cbdfc..0059f0488acc22ebddc2faf4c5879f9f0c24fd14 100644
+index 88145f04989c71a686aae1b486087ecdf55e268c..c6821bfb28b582733cd977864c28ca5cf0c69872 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -262,7 +262,7 @@ public final class NaturalSpawner {
@@ -18646,7 +18646,7 @@ index c79b193ad822b8c246f24a87cd418892bc18ff5a..4342bc5aad49fe372d561296a6b63818
         public void restart() {
             org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3403b75c8311f1e52a0533363c5f0307442f8a15..92cb1fd2419eb3a3e64ebc0c5e699a79483f8c44 100644
+index 4607dcfa911ab554e7ad0e043caf9bcc72e94823..67761ed1486c110eacd4c10fe617648efe082ee7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -289,7 +289,7 @@ public class CraftWorld implements World {
@@ -18991,7 +18991,7 @@ index 8ccfe9488db44d7d2cf4040a5b4cead33da1d5f4..d8c572b686c332eca722922c8a96d462
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index a430506c31d9ce7a5c90d726a68f097498629545..e8c5109c36d437287e3eec23a5d1031f197a6162 100644
+index 08634e060b35d653c5677b7c1012cfda266bf002..70ff3b27d3dae162d05edba7987136ee53decf2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
@@ -1,5 +1,6 @@
@@ -19001,7 +19001,7 @@ index a430506c31d9ce7a5c90d726a68f097498629545..e8c5109c36d437287e3eec23a5d1031f
 import java.util.List;
 import java.util.Random;
 import java.util.function.Predicate;
-@@ -234,4 +235,20 @@ public class DummyGeneratorAccess implements LevelAccessor {
+@@ -235,4 +236,20 @@ public class DummyGeneratorAccess implements LevelAccessor {
     public boolean destroyBlock(BlockPos pos, boolean drop, Entity breakingEntity, int maxUpdateDepth) {
         return false; // SPIGOT-6515
     }
--- a/patches/server/0004-Component-related-conveniences.patch
+++ b/patches/server/0004-Component-related-conveniences.patch
@@ -36,10 +36,10 @@ index dcba69c0ad3288ddc64dacc58b6fb857eed3109c..57200e6b419ab0793df6498467325b6d
     public void displayClientMessage(Component message, boolean actionBar) {
         this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2fd0a432ed52ca137622a1f631e886aaf77f33d3..a8a1affc747aee30c227d79f563facb8503d9c5e 100644
+index 936ae5576902e6593bd21af4d3cf3998109347b5..6cb325b098fe64b746940ce79fd927320ec444e6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1391,6 +1391,62 @@ public abstract class PlayerList {
+@@ -1396,6 +1396,62 @@ public abstract class PlayerList {
     }
     // CraftBukkit end
 
@@ -103,7 +103,7 @@ index 2fd0a432ed52ca137622a1f631e886aaf77f33d3..a8a1affc747aee30c227d79f563facb8
         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 e75efd67acb063e3ce7506839e4a888241bda703..6800ba596ce3decfe268ccf897d7951a233e730d 100644
+index d9265426ddb91a6cff634b8fcc3ed26072379f43..3d50e17f13a9c9678b8d912f874096fbd28a42ee 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
--- a/patches/server/0005-Ridables.patch
+++ b/patches/server/0005-Ridables.patch
@@ -73,10 +73,10 @@ index 57200e6b419ab0793df6498467325b6d5690c17f..bd787b4122502eacacadd8d47ea5aa5d
 +
 }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 53e9ba24338690b1c5f12250748273758c68f4d1..26a391223dc1595892cb8bee4815525adb593d32 100644
+index 733ba23aa8f8d84eba556604fd743449a313a659..0a7d339a1b52f5b70830708d5eabac3f8d85f888 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2407,6 +2407,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2412,6 +2412,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
 
                         ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
 
@@ -86,7 +86,7 @@ index 53e9ba24338690b1c5f12250748273758c68f4d1..26a391223dc1595892cb8bee4815525a
                         if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                             ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6800ba596ce3decfe268ccf897d7951a233e730d..d40b224c0d8397d3876c605e27275756d927f843 100644
+index 3d50e17f13a9c9678b8d912f874096fbd28a42ee..e47673d410936068ceff8b757050cc6c8a15816c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -135,7 +135,7 @@ index 6800ba596ce3decfe268ccf897d7951a233e730d..d40b224c0d8397d3876c605e27275756
             if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                 this.passengers = ImmutableList.of();
             } else {
-@@ -4208,4 +4222,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4213,4 +4227,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
         return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
     }
     // Paper end
@@ -201,7 +201,7 @@ index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b
     protected ParticleOptions getInkParticle() {
         return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 92fd98540e8d5ada4eaaf83bee8cdd276c4458a7..38b1919c4e725879521c31c0edb8cdf8409edb83 100644
+index 027898e97667081840562547653d4adaeae01dda..31c5ac568042150d89572daecd1e22ceb6dc69aa 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -220,9 +220,9 @@ public abstract class LivingEntity extends Entity {
--- a/patches/server/0019-Player-invulnerabilities.patch
+++ b/patches/server/0019-Player-invulnerabilities.patch
@@ -66,7 +66,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..156f04fab90d44775ec8036da1b9a763
     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 ff5e61ba0cb9602a332dfc59a40b2a9776acaef4..4525f732c12411641f77410255d3ef6a5afdc268 100644
+index d2270b53e6a8f74f7382d5c4dc4474a3a8d83fa4..77a0ad0ab7291f50e8d3bf864595a0f52a4114bf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1918,6 +1918,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -78,10 +78,10 @@ index ff5e61ba0cb9602a332dfc59a40b2a9776acaef4..4525f732c12411641f77410255d3ef6a
         this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
         // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a8a1affc747aee30c227d79f563facb8503d9c5e..242157b074794d1c69eec7af53d27efa7ef7f56e 100644
+index 6cb325b098fe64b746940ce79fd927320ec444e6..ac68314c5c2de8376e11abd95b50b4b0bd2c00eb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -993,6 +993,8 @@ public abstract class PlayerList {
+@@ -998,6 +998,8 @@ public abstract class PlayerList {
         }
         // Paper end
 
--- a/patches/server/0022-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0022-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 4525f732c12411641f77410255d3ef6a5afdc268..58cd2fdf616f450e7906e90dc9725f1067c13052 100644
+index 77a0ad0ab7291f50e8d3bf864595a0f52a4114bf..f4e4ca801a585b8c0335cc3c59f1278d1c108f2b 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
@@ -38,7 +38,7 @@ index 4525f732c12411641f77410255d3ef6a5afdc268..58cd2fdf616f450e7906e90dc9725f10
         if (this.keepAlivePending) {
             if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3069,6 +3085,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3074,6 +3090,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
 
     @Override
     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
--- a/patches/server/0046-Signs-allow-color-codes.patch
+++ b/patches/server/0046-Signs-allow-color-codes.patch
@@ -17,10 +17,10 @@ index 156f04fab90d44775ec8036da1b9a763544c8ccb..18b21258e39cbc54eaeaa44a4398a3b1
         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 58cd2fdf616f450e7906e90dc9725f1067c13052..c19b708cd7c6ec18ea44a5afa3b7e1c4ac4ddcb6 100644
+index f4e4ca801a585b8c0335cc3c59f1278d1c108f2b..0be0d27e2534fccf0f8ff828476e2a0612c60d71 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3059,11 +3059,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3064,11 +3064,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                     }
                 }
                 // Paper end
@@ -43,7 +43,7 @@ index 58cd2fdf616f450e7906e90dc9725f1067c13052..c19b708cd7c6ec18ea44a5afa3b7e1c4
             SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);
             this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 9b5d11ece006d7aa893360a84ba652c666517ac1..bdd6d8201ac078635d637081a37f353c6f8fd6fe 100644
+index 171fea79d3a7c282e473b0fbb46254e3cd9c7aa9..ccbfed191a59e839fb5eae2c338de3b2fd70005e 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -180,6 +180,22 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
--- a/patches/server/0055-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0055-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 242157b074794d1c69eec7af53d27efa7ef7f56e..e3d557e570a56b9b0016206775fcd5313060f573 100644
+index ac68314c5c2de8376e11abd95b50b4b0bd2c00eb..1d89441b6d650691aef4bbbb714cee1f3d73774a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1158,6 +1158,7 @@ public abstract class PlayerList {
+@@ -1163,6 +1163,7 @@ public abstract class PlayerList {
             } else {
                 b0 = (byte) (24 + i);
             }
--- a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ 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 b4d0df32fb9e8357ee87c779ff1228fb4f0009f5..d4f1984fcf965cb5b9bb9f2e10d790286d25c613 100644
+index 5a23bc98f38e715ee16abe9a370b044e928b2d03..6db330cf388ef80f3acb84e41f02063c36f9aaf2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4259,5 +4259,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4264,5 +4264,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
     public boolean processClick(InteractionHand hand) {
         return false;
     }
--- a/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e3d557e570a56b9b0016206775fcd5313060f573..ecb2eafd9eb851ed1a39866c840dc0a5381277b8 100644
+index 1d89441b6d650691aef4bbbb714cee1f3d73774a..29043f9354b29f7766f1d6d8e793e2ea23883fa0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1007,22 +1007,22 @@ public abstract class PlayerList {
+@@ -1012,22 +1012,22 @@ public abstract class PlayerList {
     }
 
     public void tick() {
--- a/patches/server/0143-Implement-TPSBar.patch
+++ b/patches/server/0143-Implement-TPSBar.patch
@@ -42,13 +42,13 @@ index 1b8d836607d52c3bc67ad5f2accbc94663637d49..606d5577f121b0103e272bbe4ffa4b58
         }
     }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ecb2eafd9eb851ed1a39866c840dc0a5381277b8..5043ddc861c9eab1e47e2cac68f4b73da317d27f 100644
+index 29043f9354b29f7766f1d6d8e793e2ea23883fa0..5141185821c798cb20f7936d7927d2256d9be75f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -588,6 +588,8 @@ public abstract class PlayerList {
+@@ -593,6 +593,8 @@ public abstract class PlayerList {
     }
- 
-     public net.kyori.adventure.text.Component disconnect(ServerPlayer entityplayer) { // Paper - return Component
+     public net.kyori.adventure.text.Component disconnect(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
+         // Paper end
 +        net.pl3x.purpur.task.TPSBarTask.removePlayer(entityplayer.getBukkitEntity()); // Purpur
 +
         ServerLevel worldserver = entityplayer.getLevel();
--- a/patches/server/0148-Add-MC-4-fix-back.patch
+++ b/patches/server/0148-Add-MC-4-fix-back.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add MC-4 fix back


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 260a2d8616030c0f5619eb357719b980f93570c8..b7b00d28f60350958dd0e92b755237c1f15040ec 100644
+index ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4..b106801e08d5a87eaaf115653cf57f58f45f5869 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4029,7 +4029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     public final void setPosRaw(double x, double y, double z) {
+@@ -4034,7 +4034,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+         // Paper end
         // Paper start - fix MC-4
         if (this instanceof ItemEntity) {
 -            if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert
--- a/patches/server/0207-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0207-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>

 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b9b94da26 100644
+index 6972880a375c60d19c03e0988e9ab9f80041d451..010a47813b2b3dbc0739c203e4186d14cc780579 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4272,5 +4272,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4277,5 +4277,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
     public boolean canSaveToDisk() {
         return true;
     }
@@ -29,7 +29,7 @@ index eea15d795475b79994c1b6ba55e862399831f960..f3304cefa0a8862ef27dcb00519a8a3b
     // 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 420a3ca6daab141a541f35154f7d7e65bed8ea54..124cee713c3a808bd9c52f105a38ce71b6c9b423 100644
+index 8484f49814940b0350d1bec6b4bb5bf6519fbb1c..a0398eef44f65eae1404e122b3086db7aa688f8a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity {
@@ -348,7 +348,7 @@ index 1035e023003521574a09fdea3fd08e5fca66d8fc..7484f9c13e41f9be305134595b7052df
     // Purpur end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 23c136ed6daf5111b97996053df18413480532e5..97d892edfed76df90c4e6294b0a3c2d43da06860 100644
+index e0acfc315f80d9a5c5aa045845ccc3e00c4435c5..99ee365536304799082549d48811df436224eb64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -889,5 +889,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
--- a/patches/server/0216-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0216-Allow-player-join-full-server-by-permission.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow player join full server by permission


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5043ddc861c9eab1e47e2cac68f4b73da317d27f..4b93a16db40889a0de99bdac038b0cc8ac37039f 100644
+index 5141185821c798cb20f7936d7927d2256d9be75f..5fdbdc2d3deb09da018d0db1b495d9fb52e39b44 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -759,7 +759,7 @@ public abstract class PlayerList {
+@@ -764,7 +764,7 @@ public abstract class PlayerList {
             event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(chatmessage)); // Paper - Adventure
         } else {
             // return this.players.size() >= this.maxPlayers && !this.d(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;
--- a/patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
+++ b/patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] SPIGOT-5988 Fix bed respawn location not resetting


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4b93a16db40889a0de99bdac038b0cc8ac37039f..602b96d5dfbeb9a24072a8c80db3547a2af2ae6f 100644
+index 5fdbdc2d3deb09da018d0db1b495d9fb52e39b44..b984f3fdadd5d44e8e2c1fa12a531a26210cbeed 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -897,6 +897,7 @@ public abstract class PlayerList {
+@@ -902,6 +902,7 @@ public abstract class PlayerList {
                     location = new Location(worldserver1.getWorld(), vec3d.x, vec3d.y, vec3d.z, f1, 0.0F);
                 } else if (blockposition != null) {
                     entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));