prep for 1.21.11 update

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

@@ -1,82 +0,0 @@
---- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-@@ -40,10 +_,11 @@
-     public final Connection connection; // Paper
-     private final boolean transferred;
-     //private long keepAliveTime; // Paper - improve keepalives
--    //private boolean keepAlivePending; // Paper - improve keepalives
-+    private boolean keepAlivePending; // Paper - improve keepalives // Purpur - Alternative Keepalive Handling
-     //private long keepAliveChallenge; // Paper - improve keepalives
-     private long closedListenerTime;
-     private boolean closed = false;
-+    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Purpur - Alternative Keepalive Handling
-     private volatile int latency; // Paper - improve keepalives - make volatile
-     private final io.papermc.paper.util.KeepAlive keepAlive; // Paper - improve keepalives
-     private volatile boolean suspendFlushingOnServerThread = false;
-@@ -54,6 +_,10 @@
-     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
-     private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
-     protected static final net.minecraft.resources.ResourceLocation MINECRAFT_BRAND = net.minecraft.resources.ResourceLocation.withDefaultNamespace("brand"); // Paper - Brand support
-+    // Purpur start - Purpur client support
-+    protected static final net.minecraft.resources.ResourceLocation PURPUR_CLIENT = net.minecraft.resources.ResourceLocation.fromNamespaceAndPath("purpur", "client");
-+    public boolean purpurClient;
-+    // Purpur end - Purpur client support
-     // Paper start - retain certain values
-     public @Nullable String playerBrand;
-     public final java.util.Set<String> pluginMessagerChannels;
-@@ -105,6 +_,18 @@
-         // Paper start - improve keepalives
-         long now = System.nanoTime();
-         io.papermc.paper.util.KeepAlive.PendingKeepAlive pending = this.keepAlive.pendingKeepAlives.peek();
-+        // Purpur start - Alternative Keepalive Handling
-+        if (org.purpurmc.purpur.PurpurConfig.useAlternateKeepAlive) {
-+            if (this.keepAlivePending && !keepAlives.isEmpty() && keepAlives.contains(packet.getId())) {
-+                int ping = (int) (Util.getMillis() - packet.getId());
-+                int updatedLatency = (this.latency * 3 + ping) / 4;
-+                this.latency = updatedLatency;
-+                this.keepAlivePending = false;
-+                keepAlives.clear(); // we got a valid response, lets roll with it and forget the rest
-+            }
-+            return;
-+        } else
-+        // Purpur end - Alternative Keepalive Handling
-         if (pending != null && pending.challengeId() == packet.getId()) {
-             this.keepAlive.pendingKeepAlives.remove(pending);
- 
-@@ -179,6 +_,12 @@
-                 return;
-             }
- 
-+            // Purpur start - Purpur client support
-+            if (identifier.equals(PURPUR_CLIENT)) {
-+                this.purpurClient = true;
-+            }
-+            // Purpur end - Purpur client support
-+
-             if (identifier.equals(MINECRAFT_BRAND)) {
-                 this.playerBrand = new net.minecraft.network.FriendlyByteBuf(io.netty.buffer.Unpooled.wrappedBuffer(data)).readUtf(256);
-             }
-@@ -264,6 +_,23 @@
-         Profiler.get().push("keepAlive");
-         long millis = Util.getMillis();
-         // Paper start - improve keepalives
-+        // Purpur start - Alternative Keepalive Handling
-+        if (org.purpurmc.purpur.PurpurConfig.useAlternateKeepAlive) {
-+            if (this.checkIfClosed(millis) && !this.processedDisconnect) {
-+                long currTime = System.nanoTime();
-+                if ((currTime - this.keepAlive.lastKeepAliveTx) >= java.util.concurrent.TimeUnit.SECONDS.toNanos(1L)) { // 1 second
-+                    this.keepAlive.lastKeepAliveTx = currTime;
-+                    if (this.keepAlivePending && !this.processedDisconnect && keepAlives.size() * 1000L >= KEEPALIVE_LIMIT) {
-+                        this.disconnect(TIMEOUT_DISCONNECTION_MESSAGE, io.papermc.paper.connection.DisconnectionReason.TIMEOUT);
-+                    } else if (this.checkIfClosed(millis)) {
-+                        this.keepAlivePending = true;
-+                        this.keepAlives.add(millis); // currentTime is ID
-+                        this.send(new ClientboundKeepAlivePacket(millis));
-+                    }
-+                }
-+            }
-+        } else
-+        // Purpur end - Alternative Keepalive Handling
-         if (this.checkIfClosed(millis) && !this.processedDisconnect) {
-             long currTime = System.nanoTime();
- 

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

@@ -1,233 +0,0 @@
---- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -341,6 +_,20 @@
-     }
-     // Paper end - configuration phase API
- 
-+    // 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) {
-@@ -358,6 +_,12 @@
-                 && this.server.playerIdleTimeout() > 0
-                 && Util.getMillis() - this.player.getLastActionTime() > TimeUnit.MINUTES.toMillis(this.server.playerIdleTimeout())
-                 && !this.player.wonGame) {
-+                // 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.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
-             }
-         }
-@@ -672,6 +_,8 @@
-                     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);
-@@ -751,6 +_,7 @@
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
-         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;
-             }
-@@ -1284,6 +_,10 @@
-             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;
-@@ -1308,7 +_,8 @@
-             }
- 
-             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;
-             }
-@@ -1327,31 +_,45 @@
-             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.getPlainTextName(), 0, list, true)
-             );
-@@ -1364,6 +_,16 @@
-         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.level());
-@@ -1403,7 +_,15 @@
-     @Override
-     public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
--        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.level();
-@@ -1585,7 +_,7 @@
-                                         movedWrongly = true;
-                                         if (event.getLogWarning())
-                                      // Paper end
--                                    LOGGER.warn("{} moved wrongly!", this.player.getPlainTextName());
-+                                    LOGGER.warn("{} moved wrongly!, ({})", this.player.getPlainTextName(), verticalDelta); // Purpur - AFK API
-                                     } // Paper
-                                 }
- 
-@@ -1650,6 +_,8 @@
-                                         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);
-@@ -1705,6 +_,13 @@
-                                         this.player.tryResetCurrentImpulseContext();
-                                     }
- 
-+                                    // Purpur start - Dont run with scissors!
-+                                    if (this.player.level().purpurConfig.dontRunWithScissors && this.player.isSprinting() && !(this.player.level().purpurConfig.ignoreScissorsInWater && this.player.isInWater()) && !(this.player.level().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.level(), this.player.damageSources().scissors(), (float) this.player.level().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();
-@@ -1722,6 +_,17 @@
-         }
-     }
- 
-+    // 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.level().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;
-@@ -2121,6 +_,7 @@
- 
-                 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 {
-@@ -2768,6 +_,7 @@
- 
-                 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
-@@ -3509,7 +_,7 @@
-     @Override
-     public void handleChangeGameMode(ServerboundChangeGameModePacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
--        if (!this.player.hasPermissions(2)) {
-+        if (!this.player.hasPermissions(2) && !player.getBukkitEntity().hasPermission("purpur.debug.f3n")) { // Purpur - Add permission for F3+N debug
-             LOGGER.warn(
-                 "Player {} tried to change game mode to {} without required permissions",
-                 this.player.getGameProfile().name(),

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

@@ -1,11 +0,0 @@
---- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -276,7 +_,7 @@
-                         ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
-                         ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(string1)); // Spigot
-                     } else {
--                        ServerLoginPacketListenerImpl.this.disconnect(Component.translatable("multiplayer.disconnect.unverified_username"));
-+                        ServerLoginPacketListenerImpl.this.disconnect(org.purpurmc.purpur.PurpurConfig.unverifiedUsername.equals("default") ? Component.translatable("multiplayer.disconnect.unverified_username") : io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(org.purpurmc.purpur.PurpurConfig.unverifiedUsername))); // Purpur - Config for unverified username message
-                         ServerLoginPacketListenerImpl.LOGGER.error("Username '{}' tried to join with an invalid session", string1);
-                     }
-                 } catch (AuthenticationUnavailableException var4) {

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

@@ -1,10 +0,0 @@
---- a/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
-@@ -37,6 +_,7 @@
-         } else {
-             this.hasRequestedStatus = true;
-             // this.connection.send(new ClientboundStatusResponsePacket(this.status)); // Paper
-+            if (net.minecraft.server.MinecraftServer.getServer().getStatus().version().isEmpty()) return; // Purpur - Fix 'outdated server' showing in ping before server fully boots - do not respond to pings before we know the protocol version
-             com.destroystokyo.paper.network.StandardPaperServerListPingEventImpl.processRequest(net.minecraft.server.MinecraftServer.getServer(), this.connection); // Paper - handle status request
-         }
-     }