apply the rest of the minecraft file patches \o/

purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/PlayerAdvancements.java.patch

@@ -1,26 +0,0 @@
-From 10208bcef5c949e133092f588296ebb6e22f36d8 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 06:37:42 -0700
-Subject: [PATCH] purpur File Patches
-
-
-diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
-index 52e0ae233a7b1c88bfbbc27707ef5f18453ec865..bc5fe40ba202bf80b925f08ceee045e8a69a7d45 100644
---- a/net/minecraft/server/PlayerAdvancements.java
-+++ b/net/minecraft/server/PlayerAdvancements.java
-@@ -148,6 +148,7 @@ public class PlayerAdvancements {
-             AdvancementHolder advancementHolder = advancementManager.get(path);
-             if (advancementHolder == null) {
-                 if (!path.getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE)) return; // CraftBukkit
-+                if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressIgnoredAdvancementWarnings) // Purpur - Logger settings (suppressing pointless logs)
-                 LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", path, this.playerSavePath);
-             } else {
-                 this.startProgress(advancementHolder, progress);
-@@ -195,6 +196,7 @@ public class PlayerAdvancements {
-                 advancement.value().display().ifPresent(displayInfo -> {
-                     // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
-                     if (event.message() != null && this.player.serverLevel().getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
-+                        if (org.purpurmc.purpur.PurpurConfig.advancementOnlyBroadcastToAffectedPlayer) this.player.sendMessage(message); else // Purpur - Configurable broadcast settings
-                         this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
-                         // Paper end
-                     }

purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -1,284 +0,0 @@
-From 10208bcef5c949e133092f588296ebb6e22f36d8 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 06:37:42 -0700
-Subject: [PATCH] purpur File Patches
-
-
-diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 3781d9cc174b7aecacb9b9855d52c7b1ff05835c..5ced523477c2b86e2b46182a77a9d991cf4cdd1f 100644
---- a/net/minecraft/server/level/ServerPlayer.java
-+++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -420,6 +420,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-     public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
-     public @Nullable String clientBrandName = null; // Paper - Brand support
-     public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
-+    public boolean purpurClient = false; // Purpur - Purpur client support
-+    private boolean tpsBar = false; // Purpur - Implement TPSBar
-+    private boolean compassBar = false; // Purpur - Add compass command
-+    private boolean ramBar = false; // Purpur - Implement rambar commands
- 
-     // Paper start - rewrite chunk system
-     private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -553,6 +557,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         this.respawnConfig = compound.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null);
-         this.spawnExtraParticlesOnFall = compound.getBooleanOr("spawn_extra_particles_on_fall", false);
-         this.raidOmenPosition = compound.read("raid_omen_position", BlockPos.CODEC).orElse(null);
-+
-+        this.tpsBar = compound.getBooleanOr("Purpur.TPSBar", false); // Purpur - Implement TPSBar
-+        this.compassBar = compound.getBooleanOr("Purpur.CompassBar", false); // Purpur - Add compass command
-+        this.ramBar = compound.getBooleanOr("Purpur.RamBar", false); // Purpur - Implement rambar command
-     }
- 
-     @Override
-@@ -570,6 +578,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         compound.storeNullable("raid_omen_position", BlockPos.CODEC, this.raidOmenPosition);
-         this.saveEnderPearls(compound);
-         this.getBukkitEntity().setExtraData(compound); // CraftBukkit
-+        compound.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur - Implement TPSBar
-+        compound.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur - Add compass command
-+        compound.putBoolean("Purpur.RamBar", this.ramBar); // Purpur - Add rambar command
-     }
- 
-     private void saveParentVehicle(CompoundTag tag) {
-@@ -1063,6 +1074,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-             // Paper - moved up to sendClientboundPlayerCombatKillPacket()
-             sendClientboundPlayerCombatKillPacket(event.getShowDeathMessages(), deathScreenMessage); // Paper - Expand PlayerDeathEvent
-             Team team = this.getTeam();
-+            if (org.purpurmc.purpur.PurpurConfig.deathMessageOnlyBroadcastToAffectedPlayer) this.sendSystemMessage(deathMessage); else // Purpur - Configurable broadcast settings
-             if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
-                 this.server.getPlayerList().broadcastSystemMessage(deathMessage, false);
-             } else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
-@@ -1169,6 +1181,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         if (this.isInvulnerableTo(level, damageSource)) {
-             return false;
-         } else {
-+            // Purpur start - Add boat fall damage config
-+            if (damageSource.is(net.minecraft.tags.DamageTypeTags.IS_FALL)) {
-+                if (getRootVehicle() instanceof net.minecraft.world.entity.vehicle.Boat && !level().purpurConfig.boatsDoFallDamage) {
-+                    return false;
-+                }
-+            }
-+            // Purpur end - Add boat fall damage config
-             Entity entity = damageSource.getEntity();
-             if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
-              !(entity instanceof Player player && !this.canHarmPlayer(player))
-@@ -1395,6 +1414,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-                 serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
-                 this.unsetRemoved();
-                 // CraftBukkit end
-+                this.portalPos = org.bukkit.craftbukkit.util.CraftLocation.toBlockPosition(exit); // Purpur - Fix stuck in portals
-                 this.setServerLevel(level);
-                 this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
-                 this.connection.resetPosition();
-@@ -1512,7 +1532,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-                             new AABB(vec3.x() - 8.0, vec3.y() - 5.0, vec3.z() - 8.0, vec3.x() + 8.0, vec3.y() + 5.0, vec3.z() + 8.0),
-                             monster -> monster.isPreventingPlayerRest(this.serverLevel(), this)
-                         );
--                    if (!entitiesOfClass.isEmpty()) {
-+                    if (!this.level().purpurConfig.playerSleepNearMonsters && !entitiesOfClass.isEmpty()) { // Purpur - Config to ignore nearby mobs when sleeping
-                         return Either.left(Player.BedSleepingProblem.NOT_SAFE);
-                     }
-                 }
-@@ -1549,7 +1569,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-                     CriteriaTriggers.SLEPT_IN_BED.trigger(this);
-                 });
-                 if (!this.serverLevel().canSleepThroughNights()) {
--                    this.displayClientMessage(Component.translatable("sleep.not_possible"), true);
-+                    // Purpur start - Customizable sleeping actionbar messages
-+                    Component clientMessage;
-+                    if (org.purpurmc.purpur.PurpurConfig.sleepNotPossible.isBlank()) {
-+                        clientMessage = null;
-+                    } else if (!org.purpurmc.purpur.PurpurConfig.sleepNotPossible.equalsIgnoreCase("default")) {
-+                        clientMessage = io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.purpurmc.purpur.PurpurConfig.sleepNotPossible));
-+                    } else {
-+                        clientMessage = Component.translatable("sleep.not_possible");
-+                    }
-+                    if (clientMessage != null) {
-+                        this.displayClientMessage(clientMessage, true);
-+                    }
-+                    // Purpur end - Customizable sleeping actionbar messages
-                 }
- 
-                 ((ServerLevel)this.level()).updateSleepingPlayerList();
-@@ -1641,6 +1673,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
- 
-     @Override
-     public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) {
-+        if (level().purpurConfig.signAllowColors) this.connection.send(signEntity.getTranslatedUpdatePacket(textFilteringEnabled, isFrontText)); // Purpur - Signs allow color codes
-         this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos()));
-         this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText));
-     }
-@@ -1943,6 +1976,26 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         this.lastSentExp = -1; // CraftBukkit - Added to reset
-     }
- 
-+    // Purpur start - Component related conveniences
-+    public void sendActionBarMessage(@Nullable String message) {
-+        if (message != null && !message.isEmpty()) {
-+            sendActionBarMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
-+        }
-+    }
-+
-+    public void sendActionBarMessage(@Nullable net.kyori.adventure.text.Component message) {
-+        if (message != null) {
-+            sendActionBarMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
-+        }
-+    }
-+
-+    public void sendActionBarMessage(@Nullable Component message) {
-+        if (message != null) {
-+            displayClientMessage(message, true);
-+        }
-+    }
-+    // Purpur end - Component related conveniences
-+
-     @Override
-     public void displayClientMessage(Component chatComponent, boolean actionBar) {
-         this.sendSystemMessage(chatComponent, actionBar);
-@@ -2160,6 +2213,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         );
-     }
- 
-+    // Purpur start - Component related conveniences
-+    public void sendMiniMessage(@Nullable String message) {
-+        if (message != null && !message.isEmpty()) {
-+            this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
-+        }
-+    }
-+
-+    public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
-+        if (message != null) {
-+            this.sendSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
-+        }
-+    }
-+    // Purpur end - Component related conveniences
-+
-     public void sendSystemMessage(Component mesage) {
-         this.sendSystemMessage(mesage, false);
-     }
-@@ -2298,8 +2365,68 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
- 
-     public void resetLastActionTime() {
-         this.lastActionTime = Util.getMillis();
-+        this.setAfk(false); // Purpur - AFK API
-     }
- 
-+    // Purpur start - AFK API
-+    private boolean isAfk = false;
-+
-+    @Override
-+    public void setAfk(boolean afk) {
-+        if (this.isAfk == afk) {
-+            return;
-+        }
-+
-+        String msg = afk ? org.purpurmc.purpur.PurpurConfig.afkBroadcastAway : org.purpurmc.purpur.PurpurConfig.afkBroadcastBack;
-+
-+        org.purpurmc.purpur.event.PlayerAFKEvent event = new org.purpurmc.purpur.event.PlayerAFKEvent(this.getBukkitEntity(), afk, this.level().purpurConfig.idleTimeoutKick, msg, !org.bukkit.Bukkit.isPrimaryThread());
-+        if (!event.callEvent() || event.shouldKick()) {
-+            return;
-+        }
-+
-+        this.isAfk = afk;
-+
-+        if (!afk) {
-+            resetLastActionTime();
-+        }
-+
-+        msg = event.getBroadcastMsg();
-+        if (msg != null && !msg.isEmpty()) {
-+            String playerName = this.getGameProfile().getName();
-+            if (org.purpurmc.purpur.PurpurConfig.afkBroadcastUseDisplayName) {
-+                net.kyori.adventure.text.Component playerDisplayNameComponent = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(this.getBukkitEntity().getDisplayName());
-+                playerName = net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText().serialize(playerDisplayNameComponent);
-+            }
-+            server.getPlayerList().broadcastMiniMessage(String.format(msg, playerName), false);
-+        }
-+
-+        if (this.level().purpurConfig.idleTimeoutUpdateTabList) {
-+            String scoreboardName = getScoreboardName();
-+            String playerListName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().serialize(getBukkitEntity().playerListName());
-+            String[] split = playerListName.split(scoreboardName);
-+            String prefix = (split.length > 0 ? split[0] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix, "");
-+            String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, "");
-+            if (afk) {
-+                getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + prefix + scoreboardName + suffix + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true);
-+            } else {
-+                getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix, true);
-+            }
-+        }
-+
-+        ((ServerLevel) this.level()).updateSleepingPlayerList();
-+    }
-+
-+    @Override
-+    public boolean isAfk() {
-+        return this.isAfk;
-+    }
-+
-+    @Override
-+    public boolean canBeCollidedWith() {
-+        return !this.isAfk() && super.canBeCollidedWith();
-+    }
-+    // Purpur end - AFK API
-+
-     public ServerStatsCounter getStats() {
-         return this.stats;
-     }
-@@ -2926,4 +3053,56 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
-     }
-     // CraftBukkit end
-+
-+    // Purpur start - Add option to teleport to spawn if outside world border
-+    public void teleport(org.bukkit.Location to) {
-+        this.ejectPassengers();
-+        this.stopRiding(true);
-+
-+        if (this.isSleeping()) {
-+            this.stopSleepInBed(true, false);
-+        }
-+
-+        if (this.containerMenu != this.inventoryMenu) {
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT);
-+        }
-+
-+        ServerLevel toLevel = ((org.bukkit.craftbukkit.CraftWorld) to.getWorld()).getHandle();
-+        if (this.level() == toLevel) {
-+            this.connection.teleport(to);
-+        } else {
-+            this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
-+        }
-+    }
-+    // Purpur end - Add option to teleport to spawn if outside world border
-+
-+    // Purpur start - Implement TPSBar
-+    public boolean tpsBar() {
-+        return this.tpsBar;
-+    }
-+
-+    public void tpsBar(boolean tpsBar) {
-+        this.tpsBar = tpsBar;
-+    }
-+    // Purpur end - Implement TPSBar
-+
-+    // Purpur start - Add compass command
-+    public boolean compassBar() {
-+        return this.compassBar;
-+    }
-+
-+    public void compassBar(boolean compassBar) {
-+        this.compassBar = compassBar;
-+    }
-+    // Purpur end - Add compass command
-+
-+    // Purpur start - Add rambar command
-+    public boolean ramBar() {
-+        return this.ramBar;
-+    }
-+
-+    public void ramBar(boolean ramBar) {
-+        this.ramBar = ramBar;
-+    }
-+    // Purpur end - Add rambar command
- }

purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,232 +0,0 @@
-From 10208bcef5c949e133092f588296ebb6e22f36d8 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 06:37:42 -0700
-Subject: [PATCH] purpur File Patches
-
-
-diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9041830c19e2899479e1519488faba5c416ccd88..bf8a8124145e4339cadcc83691f076bdad3ec43d 100644
---- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -321,6 +321,20 @@ public class ServerGamePacketListenerImpl
-         this.tickEndEvent = new io.papermc.paper.event.packet.ClientTickEndEvent(player.getBukkitEntity()); // Paper - add client tick end event
-     }
- 
-+    // Purpur start - AFK API
-+    private final com.google.common.cache.LoadingCache<org.bukkit.craftbukkit.entity.CraftPlayer, Boolean> kickPermissionCache = com.google.common.cache.CacheBuilder.newBuilder()
-+        .maximumSize(1000)
-+        .expireAfterWrite(1, java.util.concurrent.TimeUnit.MINUTES)
-+        .build(
-+            new com.google.common.cache.CacheLoader<>() {
-+                @Override
-+                public Boolean load(org.bukkit.craftbukkit.entity.CraftPlayer player) {
-+                    return player.hasPermission("purpur.bypassIdleKick");
-+                }
-+            }
-+        );
-+    // Purpur end - AFK API
-+
-     @Override
-     public void tick() {
-         if (this.ackBlockChangesUpTo > -1) {
-@@ -379,6 +393,12 @@ public class ServerGamePacketListenerImpl
-         if (this.player.getLastActionTime() > 0L
-             && this.server.getPlayerIdleTimeout() > 0
-             && Util.getMillis() - this.player.getLastActionTime() > this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits
-+            // Purpur start - AFK API
-+            this.player.setAfk(true);
-+            if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.getUnchecked(this.player.getBukkitEntity()))) {
-+                return;
-+            }
-+            // Purpur end - AFK API
-             this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
-             this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
-         }
-@@ -624,6 +644,8 @@ public class ServerGamePacketListenerImpl
-                     this.lastYaw = to.getYaw();
-                     this.lastPitch = to.getPitch();
- 
-+                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur - AFK API
-+
-                     Location oldTo = to.clone();
-                     PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
-                     this.cserver.getPluginManager().callEvent(event);
-@@ -703,6 +725,7 @@ public class ServerGamePacketListenerImpl
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-         if (packet.getId() == this.awaitingTeleport) {
-             if (this.awaitingPositionFromClient == null) {
-+                ServerGamePacketListenerImpl.LOGGER.warn("Disconnected on accept teleport packet. Was not expecting position data from client at this time"); // Purpur - Add more logger output for invalid movement kicks
-                 this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
-                 return;
-             }
-@@ -1233,6 +1256,10 @@ public class ServerGamePacketListenerImpl
-             final int maxBookPageSize = pageMax.intValue();
-             final double multiplier = Math.clamp(io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier, 0.3D, 1D);
-             long byteAllowed = maxBookPageSize;
-+            // Purpur start - PlayerBookTooLargeEvent
-+            int slot = packet.slot();
-+            ItemStack itemstack = Inventory.isHotbarSlot(slot) || slot == Inventory.SLOT_OFFHAND ? this.player.getInventory().getItem(slot) : ItemStack.EMPTY;
-+            // Purpur end - PlayerBookTooLargeEvent
-             for (final String page : pageList) {
-                 final int byteLength = page.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
-                 byteTotal += byteLength;
-@@ -1257,7 +1284,8 @@ public class ServerGamePacketListenerImpl
-             }
- 
-             if (byteTotal > byteAllowed) {
--                ServerGamePacketListenerImpl.LOGGER.warn("{} tried to send a book too large. Book size: {} - Allowed: {} - Pages: {}", this.player.getScoreboardName(), byteTotal, byteAllowed, pageList.size());
-+                ServerGamePacketListenerImpl.LOGGER.warn("{} tried to send too large of a book. Book size: {} - Allowed: {} - Pages: {}", this.player.getScoreboardName(), byteTotal, byteAllowed, pageList.size());
-+                org.purpurmc.purpur.event.player.PlayerBookTooLargeEvent event = new org.purpurmc.purpur.event.player.PlayerBookTooLargeEvent(player.getBukkitEntity(), itemstack.asBukkitCopy()); if (event.shouldKickPlayer()) // Purpur - PlayerBookTooLargeEvent
-                 this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect
-                 return;
-             }
-@@ -1276,31 +1304,45 @@ public class ServerGamePacketListenerImpl
-             Optional<String> optional = packet.title();
-             optional.ifPresent(list::add);
-             list.addAll(packet.pages());
-+            // Purpur start - Allow color codes in books
-+            boolean hasEditPerm = getCraftPlayer().hasPermission("purpur.book.color.edit");
-+            boolean hasSignPerm = hasEditPerm || getCraftPlayer().hasPermission("purpur.book.color.sign");
-+            // Purpur end - Allow color codes in books
-             Consumer<List<FilteredText>> consumer = optional.isPresent()
--                ? texts -> this.signBook(texts.get(0), texts.subList(1, texts.size()), slot)
--                : list1 -> this.updateBookContents(list1, slot);
-+                ? texts -> this.signBook(texts.get(0), texts.subList(1, texts.size()), slot, hasSignPerm) // Purpur - Allow color codes in books
-+                : list1 -> this.updateBookContents(list1, slot, hasEditPerm); // Purpur - Allow color codes in books
-             this.filterTextPacket(list).thenAcceptAsync(consumer, this.server);
-         }
-     }
- 
-     private void updateBookContents(List<FilteredText> pages, int index) {
-+    // Purpur start - Allow color codes in books
-+        updateBookContents(pages, index, false);
-+    }
-+    private void updateBookContents(List<FilteredText> pages, int index, boolean hasPerm) {
-+    // Purpur end - Allow color codes in books
-         // CraftBukkit start
-         ItemStack handItem = this.player.getInventory().getItem(index);
-         ItemStack item = handItem.copy();
-         // CraftBukkit end
-         if (item.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
--            List<Filterable<String>> list = pages.stream().map(this::filterableFromOutgoing).toList();
-+            List<Filterable<String>> list = pages.stream().map(filteredText -> filterableFromOutgoing(filteredText).map(s -> color(s, hasPerm))).toList(); // Purpur - Allow color codes in books
-             item.set(DataComponents.WRITABLE_BOOK_CONTENT, new WritableBookContent(list));
-             this.player.getInventory().setItem(index, CraftEventFactory.handleEditBookEvent(this.player, index, handItem, item)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
-         }
-     }
- 
-     private void signBook(FilteredText title, List<FilteredText> pages, int index) {
-+        // Purpur start - Allow color codes in books
-+        signBook(title, pages, index, false);
-+    }
-+    private void signBook(FilteredText title, List<FilteredText> pages, int index, boolean hasPerm) {
-+        // Purpur end - Allow color codes in books
-         ItemStack item = this.player.getInventory().getItem(index);
-         if (item.has(DataComponents.WRITABLE_BOOK_CONTENT)) {
-             ItemStack itemStack = item.transmuteCopy(Items.WRITTEN_BOOK);
-             itemStack.remove(DataComponents.WRITABLE_BOOK_CONTENT);
--            List<Filterable<Component>> list = pages.stream().map(filteredText -> this.filterableFromOutgoing(filteredText).<Component>map(Component::literal)).toList();
-+            List<Filterable<Component>> list = pages.stream().map((filteredText) -> this.filterableFromOutgoing(filteredText).map(s -> hexColor(s, hasPerm))).toList(); // Purpur - Allow color codes in books
-             itemStack.set(
-                 DataComponents.WRITTEN_BOOK_CONTENT,
-                 new WrittenBookContent(this.filterableFromOutgoing(title), this.player.getName().getString(), 0, list, true)
-@@ -1314,6 +1356,16 @@ public class ServerGamePacketListenerImpl
-         return this.player.isTextFilteringEnabled() ? Filterable.passThrough(filteredText.filteredOrEmpty()) : Filterable.from(filteredText);
-     }
- 
-+    // Purpur start - Allow color codes in books
-+    private Component hexColor(String str, boolean hasPerm) {
-+        return hasPerm ? PaperAdventure.asVanilla(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand().deserialize(str)) : Component.literal(str);
-+    }
-+
-+    private String color(String str, boolean hasPerm) {
-+        return hasPerm ? org.bukkit.ChatColor.color(str, false) : str;
-+    }
-+    // Purpur end - Allow color codes in books
-+
-     @Override
-     public void handleEntityTagQuery(ServerboundEntityTagQueryPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
-@@ -1349,7 +1401,15 @@ public class ServerGamePacketListenerImpl
-     @Override
-     public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
--        if (containsInvalidValues(packet.getX(0.0), packet.getY(0.0), packet.getZ(0.0), packet.getYRot(0.0F), packet.getXRot(0.0F))) {
-+        // Purpur start - Add more logger output for invalid movement kicks
-+        boolean invalidX = Double.isNaN(packet.getX(0.0));
-+        boolean invalidY = Double.isNaN(packet.getY(0.0));
-+        boolean invalidZ = Double.isNaN(packet.getZ(0.0));
-+        boolean invalidYaw = !Floats.isFinite(packet.getYRot(0.0F));
-+        boolean invalidPitch = !Floats.isFinite(packet.getXRot(0.0F));
-+        if (invalidX || invalidY || invalidZ || invalidYaw || invalidPitch) {
-+            ServerGamePacketListenerImpl.LOGGER.warn(String.format("Disconnected on move player packet. Invalid data: x=%b, y=%b, z=%b, yaw=%b, pitch=%b", invalidX, invalidY, invalidZ, invalidYaw, invalidPitch));
-+        // Purpur end - Add more logger output for invalid movement kicks
-             this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
-         } else {
-             ServerLevel serverLevel = this.player.serverLevel();
-@@ -1531,7 +1591,7 @@ public class ServerGamePacketListenerImpl
-                                         movedWrongly = true;
-                                         if (event.getLogWarning())
-                                      // Paper end
--                                    LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
-+                                    LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), verticalDelta); // Purpur - AFK API
-                                     } // Paper
-                                 }
- 
-@@ -1597,6 +1657,8 @@ public class ServerGamePacketListenerImpl
-                                         this.lastYaw = to.getYaw();
-                                         this.lastPitch = to.getPitch();
- 
-+                                        if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur - AFK API
-+
-                                         Location oldTo = to.clone();
-                                         PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
-                                         this.cserver.getPluginManager().callEvent(event);
-@@ -1652,6 +1714,13 @@ public class ServerGamePacketListenerImpl
-                                         this.player.tryResetCurrentImpulseContext();
-                                     }
- 
-+                                    // Purpur start - Dont run with scissors!
-+                                    if (this.player.serverLevel().purpurConfig.dontRunWithScissors && this.player.isSprinting() && !(this.player.serverLevel().purpurConfig.ignoreScissorsInWater && this.player.isInWater()) && !(this.player.serverLevel().purpurConfig.ignoreScissorsInLava && this.player.isInLava()) && (isScissors(this.player.getItemInHand(InteractionHand.MAIN_HAND)) || isScissors(this.player.getItemInHand(InteractionHand.OFF_HAND))) && (int) (Math.random() * 10) == 0) {
-+                                        this.player.hurtServer(this.player.serverLevel(), this.player.damageSources().scissors(), (float) this.player.serverLevel().purpurConfig.scissorsRunningDamage);
-+                                        if (!org.purpurmc.purpur.PurpurConfig.dontRunWithScissors.isBlank()) this.player.sendActionBarMessage(org.purpurmc.purpur.PurpurConfig.dontRunWithScissors);
-+                                    }
-+                                    // Purpur end - Dont run with scissors!
-+
-                                     this.player.checkMovementStatistics(this.player.getX() - x, this.player.getY() - y, this.player.getZ() - z);
-                                     this.lastGoodX = this.player.getX();
-                                     this.lastGoodY = this.player.getY();
-@@ -1669,6 +1738,17 @@ public class ServerGamePacketListenerImpl
-         }
-     }
- 
-+    // Purpur start - Dont run with scissors!
-+    public boolean isScissors(ItemStack stack) {
-+        if (!stack.is(Items.SHEARS)) return false;
-+
-+        ResourceLocation itemModelReference = stack.get(net.minecraft.core.component.DataComponents.ITEM_MODEL);
-+        if (itemModelReference != null && itemModelReference.equals(this.player.serverLevel().purpurConfig.dontRunWithScissorsItemModelReference)) return true;
-+
-+        return stack.getOrDefault(DataComponents.CUSTOM_MODEL_DATA, net.minecraft.world.item.component.CustomModelData.EMPTY).equals(net.minecraft.world.item.component.CustomModelData.EMPTY);
-+    }
-+    // Purpur end - Dont run with scissors!
-+
-     private boolean shouldCheckPlayerMovement(boolean isElytraMovement) {
-         if (this.isSingleplayerOwner()) {
-             return false;
-@@ -2065,6 +2145,7 @@ public class ServerGamePacketListenerImpl
- 
-                 boolean cancelled;
-                 if (hitResult == null || hitResult.getType() != HitResult.Type.BLOCK) {
-+                    if (this.player.gameMode.shiftClickMended(itemInHand)) return; // Purpur - Shift right click to use exp for mending
-                     org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemInHand, hand);
-                     cancelled = event.useItemInHand() == Event.Result.DENY;
-                 } else {
-@@ -2737,6 +2818,7 @@ public class ServerGamePacketListenerImpl
- 
-                 AABB boundingBox = target.getBoundingBox();
-                 if (this.player.canInteractWithEntity(boundingBox, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range
-+                    if (target instanceof net.minecraft.world.entity.Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur - Entity lifespan
-                     packet.dispatch(
-                         new ServerboundInteractPacket.Handler() {
-                             private void performInteraction(InteractionHand hand, ServerGamePacketListenerImpl.EntityInteraction entityInteraction, PlayerInteractEntityEvent event) { // CraftBukkit

purpur-server/minecraft-patches/unapplied-sources/net/minecraft/server/players/PlayerList.java.patch

@@ -1,64 +0,0 @@
-From 10208bcef5c949e133092f588296ebb6e22f36d8 Mon Sep 17 00:00:00 2001
-From: File <noreply+automated@papermc.io>
-Date: Sun, 20 Apr 1997 06:37:42 -0700
-Subject: [PATCH] purpur File Patches
-
-
-diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 9ca3c55a3b5b1a532b86b08eb92460df4cb54f2a..f7b12d5924005a24899aef11746b9f056fac3559 100644
---- a/net/minecraft/server/players/PlayerList.java
-+++ b/net/minecraft/server/players/PlayerList.java
-@@ -400,6 +400,7 @@ public abstract class PlayerList {
-             scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
-         }
-         // Paper end - Configurable player collision
-+        org.purpurmc.purpur.task.BossBarTask.addToAll(player); // Purpur - Implement TPSBar
-         PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), loggableAddress, player.getId(), serverLevel.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
-         // Paper start - Send empty chunk, so players aren't stuck in the world loading screen with our chunk system not sending chunks when dead
-         if (player.isDeadOrDying()) {
-@@ -505,6 +506,7 @@ public abstract class PlayerList {
-     }
-     public @Nullable net.kyori.adventure.text.Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) {
-         // Paper end - Fix kick event leave message not being sent
-+        org.purpurmc.purpur.task.BossBarTask.removeFromAll(player.getBukkitEntity()); // Purpur - Implement TPSBar
-         ServerLevel serverLevel = player.serverLevel();
-         player.awardStat(Stats.LEAVE_GAME);
-         // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
-@@ -663,7 +665,7 @@ public abstract class PlayerList {
-             // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)
-             //     ? Component.translatable("multiplayer.disconnect.server_full")
-             //     : null;
--            if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameProfile)) {
-+            if (this.players.size() >= this.maxPlayers && !(player.hasPermission("purpur.joinfullserver") || this.canBypassPlayerLimit(gameProfile))) { // Purpur - Allow player join full server by permission
-                 event.disallow(org.bukkit.event.player.PlayerLoginEvent.Result.KICK_FULL, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.serverFullMessage)); // Spigot // Paper - Adventure
-             }
-         }
-@@ -932,6 +934,20 @@ public abstract class PlayerList {
-         }
-     }
- 
-+    // Purpur start - Component related conveniences
-+    public void broadcastMiniMessage(@Nullable String message, boolean overlay) {
-+        if (message != null && !message.isEmpty()) {
-+            this.broadcastMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), overlay);
-+        }
-+    }
-+
-+    public void broadcastMessage(@Nullable net.kyori.adventure.text.Component message, boolean overlay) {
-+        if (message != null) {
-+            this.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), overlay);
-+        }
-+    }
-+    // Purpur end - Component related conveniences
-+
-     public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
-         for (ServerPlayer serverPlayer : this.players) {
-             if (serverPlayer.level().dimension() == dimension) {
-@@ -1016,6 +1032,7 @@ public abstract class PlayerList {
-             } else {
-                 b = (byte)(24 + permLevel);
-             }
-+            if (b < 28 && player.getBukkitEntity().hasPermission("purpur.debug.f3n")) b = 28; // Purpur - Add permission for F3+N debug
- 
-             player.connection.send(new ClientboundEntityEventPacket(player, b));
-         }