Make chat order verification configurable

patches/server/0046-Make-chat-order-verification-configurable.patch

@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Mon, 26 Dec 2022 05:22:43 +0100
+Subject: [PATCH] Make chat order verification configurable
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+This patch is based on the following patch:
+"Add option to disable out-of-order chat"
+By: Kevin Raneri <kevin.raneri@gmail.com>
+As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index d31f52ace6dd6a80adb639e1e50f4b547b23103d..9e8c1bb48b2453296cd235cc0c127032ebf73053 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -2357,6 +2357,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     }
+ 
+     private boolean updateChatOrder(Instant timestamp) {
++        // Gale start - Pufferfish - make chat order verification configurable
++        if (!GaleGlobalConfiguration.get().misc.verifyChatOrder) {
++            return true;
++        }
++        // Gale end - Pufferfish - make chat order verification configurable
+         Instant instant1;
+ 
+         do {
+diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+index be4e05851e94f943b6382ba5bb9f0750c95bdad4..5021cc0b7a0f99ec53d565862add241428311dc3 100644
+--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
++++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+@@ -57,6 +57,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+     public Misc misc;
+     public class Misc extends ConfigurationPart {
+ 
++        // Gale start - Pufferfish - make chat order verification configurable
++        /**
++         * Whether to verify the order of chat messages.
++         * If this option is set to true, and a player sends an out-of-order chat packet, they will be kicked.
++         * If this option is set to false, no verification will occur, and players will not be kicked.
++         * <ul>
++         *     <li><i>Default</i>: true</li>
++         *     <li><i>Vanilla</i>: true</li>
++         * </ul>
++         */
++        public boolean verifyChatOrder = true;
++        // Gale end - Pufferfish - make chat order verification configurable
++
+         public IncludeInTimingsReport includeInTimingsReport;
+         public class IncludeInTimingsReport extends ConfigurationPart {
+ 

patches/server/0050-Do-not-process-chat-commands-before-player-has-joine.patch

@@ -25,7 +25,7 @@ index a07da939bb6b2dd0bd75cc74dd79493695035259..9d74ef6973f6a9e12861256aa7032f8d
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d31f52ace6dd6a80adb639e1e50f4b547b23103d..e88035e907b49983daafda61a3218cef1a34b2fb 100644
+index 9e8c1bb48b2453296cd235cc0c127032ebf73053..63b54d47203d796b7dfeac2e6e04ce49b5a72ae5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2333,6 +2333,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0051-Do-not-log-invalid-statistics.patch

@@ -44,18 +44,18 @@ index 72946e324c575ef39f3939225b96b68f724da460..75e2a7d19a7056b73c1524902e44cca0
                              }
                          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index be4e05851e94f943b6382ba5bb9f0750c95bdad4..79f8d5286adeabffdcb682c33e5d2b83afb11dda 100644
+index 5021cc0b7a0f99ec53d565862add241428311dc3..6b528eab517aed9c00c75b4bf6e1a7b21194c343 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -58,6 +58,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -71,6 +71,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
-     public class Misc extends ConfigurationPart {
+         // Gale end - Pufferfish - make chat order verification configurable
  
          public IncludeInTimingsReport includeInTimingsReport;
 +
          public class IncludeInTimingsReport extends ConfigurationPart {
  
              // Gale start - include server.properties in timings
-@@ -93,4 +94,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -106,4 +107,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
      }
  

patches/server/0052-Do-not-log-empty-message-warnings.patch

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e88035e907b49983daafda61a3218cef1a34b2fb..5fe32932cce864997682b0d6b6b268074ba6f7c6 100644
+index 63b54d47203d796b7dfeac2e6e04ce49b5a72ae5..37bf4f356a23224fb5da949e8311c895c3529cf8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -183,6 +183,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index e88035e907b49983daafda61a3218cef1a34b2fb..5fe32932cce864997682b0d6b6b26807
  import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.slf4j.Logger;
  
-@@ -2541,7 +2542,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2546,7 +2547,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // CraftBukkit start
          String s = message.signedContent();
          if (s.isEmpty()) {
@@ -28,10 +28,10 @@ index e88035e907b49983daafda61a3218cef1a34b2fb..5fe32932cce864997682b0d6b6b26807
              final String conversationInput = s;
              this.server.processQueue.add(new Runnable() {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 79f8d5286adeabffdcb682c33e5d2b83afb11dda..1ac238ebf7280c70ba49c3f59d3b3800d6b39ee0 100644
+index 6b528eab517aed9c00c75b4bf6e1a7b21194c343..425206669bc13d971097ea052bffcfd6896f90d3 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -99,6 +99,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -112,6 +112,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
  

patches/server/0053-Do-not-log-ignored-advancements.patch

@@ -58,10 +58,10 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..5ba0a756d45350dcda3caa5518c9a47a
                              // CraftBukkit end
                          } else {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 1ac238ebf7280c70ba49c3f59d3b3800d6b39ee0..883a344b3e0c1a9c1cb2ed9e70a8b0e73ce28bed 100644
+index 425206669bc13d971097ea052bffcfd6896f90d3..16c9ebc736bae1626bdb4e99ac8ff1cb7afd3419 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -98,6 +98,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -111,6 +111,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public class LogToConsole extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics

patches/server/0054-Do-not-log-setBlock-in-far-chunks.patch

@@ -57,10 +57,10 @@ index 877498729c66de9aa6a27c9148f7494d7895615c..d2bbbb0e73dafd2294838137bfbd16ac
              Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
              hasSetFarWarned = true;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 883a344b3e0c1a9c1cb2ed9e70a8b0e73ce28bed..a1a073a0600ecc78b76abcd312d005aa82cad69e 100644
+index 16c9ebc736bae1626bdb4e99ac8ff1cb7afd3419..cb9648bace4522404cc9327f6aef588bc58172e0 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -112,6 +112,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements

patches/server/0055-Do-not-log-unrecognized-recipes.patch

@@ -58,10 +58,10 @@ index d13ed3069e944d138442ea440ac3eaf8d44c18d3..c89b8e5ea10a465160504f7364db4741
                      handler.accept((Recipe) optional.get());
                  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index a1a073a0600ecc78b76abcd312d005aa82cad69e..e3ba0c7bfe1f79206cf60dcd93481a14affbecbd 100644
+index cb9648bace4522404cc9327f6aef588bc58172e0..27a467029cf3e014a17a7e8ed3ab984fe9927750 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -100,6 +100,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -113,6 +113,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks

patches/server/0056-Do-not-log-legacy-Material-initialization.patch

@@ -58,10 +58,10 @@ index 110503062b3043cffa082a1cda6b8d57152869aa..951ca1e25cdcdf6a1ade4090ca397f6d
              new Exception().printStackTrace();
          }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index e3ba0c7bfe1f79206cf60dcd93481a14affbecbd..62e6e2a526190cd1ea2dcd0825619aeb942f5c4f 100644
+index 27a467029cf3e014a17a7e8ed3ab984fe9927750..133c10907358ae6064d2c1a18c967a00ad358127 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -101,6 +101,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -114,6 +114,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes

patches/server/0057-Do-not-log-expired-message-warnings.patch

@@ -28,10 +28,10 @@ index c0a80824a0307ea673805015119cc834b268f0dc..d7c6e90ccf3a8ce58e5533c5158ce626
  
                      return playerChatMessage;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 62e6e2a526190cd1ea2dcd0825619aeb942f5c4f..038d48c12b9d8612cba7c02149d4b867eff25dfd 100644
+index 133c10907358ae6064d2c1a18c967a00ad358127..3541e53b60793bc53c49402f3a3eacf12cb92b23 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -106,6 +106,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -119,6 +119,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public Chat chat;
          public class Chat extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings

patches/server/0058-Do-not-log-out-of-order-message-warnings.patch

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5fe32932cce864997682b0d6b6b268074ba6f7c6..ef336c5b93c72aec3b43d39cc5ca15128d5b0942 100644
+index 37bf4f356a23224fb5da949e8311c895c3529cf8..03befb9a39b7668ff5ec2e72ab68bbc0dd52f007 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2326,7 +2326,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -20,10 +20,10 @@ index 5fe32932cce864997682b0d6b6b268074ba6f7c6..ef336c5b93c72aec3b43d39cc5ca1512
              this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
              }); // Paper - push to main
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 038d48c12b9d8612cba7c02149d4b867eff25dfd..79c1b4fb105877f05299eb4c9a363e7ddad1fc68 100644
+index 3541e53b60793bc53c49402f3a3eacf12cb92b23..2c012ca584c84528a143609110d39a0d808a9c00 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -107,6 +107,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -120,6 +120,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public class Chat extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
              public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings

patches/server/0059-Do-not-log-Not-Secure-marker.patch

@@ -49,10 +49,10 @@ index 603d87fedf731498ebf516fdda3c785bd01bf830..05d35c0cddb2c647fff9d7238fa0f6ce
          boolean flag1 = false;
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 79c1b4fb105877f05299eb4c9a363e7ddad1fc68..63d089f23a0e158573f270e8b03a095634289d21 100644
+index 2c012ca584c84528a143609110d39a0d808a9c00..72786c52906aa327ad49577390265f326693a975 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -108,6 +108,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -121,6 +121,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
              public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
              public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
              public boolean outOfOrderMessageWarning = false; // Gale - do not log out-of-order message warnings

patches/server/0062-Softly-log-invalid-pool-element-errors.patch

@@ -39,7 +39,7 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70
          });
          this.rotation = Rotation.valueOf(nbt.getString("rotation"));
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 63d089f23a0e158573f270e8b03a095634289d21..8b9f4add9d11c4a3e361283ce636683c20f73060 100644
+index 72786c52906aa327ad49577390265f326693a975..882830dd0bddb81e1a592cdd089d4340beb946a7 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -4,8 +4,12 @@ package org.galemc.gale.configuration;
@@ -55,7 +55,7 @@ index 63d089f23a0e158573f270e8b03a095634289d21..8b9f4add9d11c4a3e361283ce636683c
  @SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
  public class GaleGlobalConfiguration extends ConfigurationPart {
      static final int CURRENT_VERSION = 1;
-@@ -95,7 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -108,7 +112,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      }
  
      public LogToConsole logToConsole;
@@ -64,7 +64,7 @@ index 63d089f23a0e158573f270e8b03a095634289d21..8b9f4add9d11c4a3e361283ce636683c
  
          public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
          public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
-@@ -111,6 +115,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -124,6 +128,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
              public boolean notSecureMarker = true; // Gale - do not log Not Secure marker
          }
  

patches/server/0063-Fix-legacy-colors-in-console.patch

@@ -131,10 +131,10 @@ index b9922b07cb105618390187d98acdf89e728e1f5a..a66d202749f243f6752df5027cb7c82f
 +
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 8b9f4add9d11c4a3e361283ce636683c20f73060..4f01d27e8c18ef45ccc26def015a2503d1c01fd0 100644
+index 882830dd0bddb81e1a592cdd089d4340beb946a7..f4f6f59af9ae02748763b82f2c2ae5da90737749 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -101,6 +101,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -114,6 +114,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
      public LogToConsole logToConsole;
      public class LogToConsole extends ConfigurationPart.Post { // Gale - EMC - softly log invalid pool element errors
  

patches/server/0076-Make-logging-login-locations-configurable.patch

@@ -31,10 +31,10 @@ index 05d35c0cddb2c647fff9d7238fa0f6ce7ddd520f..f6b8e5d32b29f38301afb7e1b93de3d3
  
      public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 4f01d27e8c18ef45ccc26def015a2503d1c01fd0..20f8b03393174af05f0d2a06ac3a0155d33ded10 100644
+index f4f6f59af9ae02748763b82f2c2ae5da90737749..599c921e30e84c7145340f575d8de1b1d71d9331 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -107,6 +107,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -120,6 +120,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
          public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization

patches/server/0077-Reduce-array-allocations.patch

@@ -479,7 +479,7 @@ index 89aaa846d5cb1cfd8ccf634f85bdc4180013cfd0..f69ea29648b090334d98dd8f3ed71cf8
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ef336c5b93c72aec3b43d39cc5ca15128d5b0942..72851ef72eb39b1bf24a618d6405df8d345d40df 100644
+index 03befb9a39b7668ff5ec2e72ab68bbc0dd52f007..66fb07316734927c4f3df1bec36ad3738f841822 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -28,6 +28,8 @@ import java.util.function.UnaryOperator;
@@ -541,7 +541,7 @@ index ef336c5b93c72aec3b43d39cc5ca15128d5b0942..72851ef72eb39b1bf24a618d6405df8d
              return;
          }
          // Paper end
-@@ -3259,7 +3257,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3264,7 +3262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {

patches/server/0114-Send-multiple-keep-alive-packets.patch

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 72851ef72eb39b1bf24a618d6405df8d345d40df..3a46580b2da12a3b9f1a525a1a481ef5ecd0f766 100644
+index 66fb07316734927c4f3df1bec36ad3738f841822..7df5ea545c19ccc43f553a229722c3fd88adc3ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -91,7 +91,7 @@ index 72851ef72eb39b1bf24a618d6405df8d345d40df..3a46580b2da12a3b9f1a525a1a481ef5
          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
-@@ -3461,6 +3482,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3466,6 +3487,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -109,10 +109,10 @@ index 72851ef72eb39b1bf24a618d6405df8d345d40df..3a46580b2da12a3b9f1a525a1a481ef5
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 20f8b03393174af05f0d2a06ac3a0155d33ded10..35e22328fccd6f7635cab3ebdde172a3ffec853f 100644
+index 599c921e30e84c7145340f575d8de1b1d71d9331..ef95ee4238c6da237e939c06c63cd8666a863ac5 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -96,6 +96,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -109,6 +109,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          }
  

patches/server/0115-Make-slow-login-timeout-configurable.patch

@@ -31,12 +31,12 @@ index 2ed3f42b1e487374287d033ac634a922a5ef37bd..af96c170c58553f4ce0554c9bd24fea2
          }
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 35e22328fccd6f7635cab3ebdde172a3ffec853f..c4f54e9e7ecc03f8417db36d8f463ffe54ead94b 100644
+index ef95ee4238c6da237e939c06c63cd8666a863ac5..7dcb82b0784816a84557a3842fe6f5f13ec3d5ff 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -61,6 +61,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -74,6 +74,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
-     public Misc misc;
+         public boolean verifyChatOrder = true;
-     public class Misc extends ConfigurationPart {
+         // Gale end - Pufferfish - make chat order verification configurable
  
 +        // Gale start - make slow login timeout configurable
 +        /**

patches/server/0116-Make-max-interaction-distance-configurable.patch

@@ -20,7 +20,7 @@ index 58b093bb1de78ee3b3b2ea364aa50474883f443a..7be34e5df2b6d33c1d7943c9c0b6fd06
              this.debugLogging(pos, false, sequence, "too far");
          } else if (pos.getY() >= worldHeight) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a46580b2da12a3b9f1a525a1a481ef5ecd0f766..dd3d223b25171db508fe36453c308d6610e78038 100644
+index 7df5ea545c19ccc43f553a229722c3fd88adc3ec..68e0f2208c5f098042ebfad08301e3154e2a2152 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -250,7 +250,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -55,7 +55,7 @@ index 3a46580b2da12a3b9f1a525a1a481ef5ecd0f766..dd3d223b25171db508fe36453c308d66
                  Vec3 vec3d2 = vec3d.subtract(vec3d1);
                  double d0 = 1.0000001D;
  
-@@ -2785,7 +2792,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2790,7 +2797,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  return;
              }
  

patches/server/0121-Ignore-null-legacy-structure-data.patch

@@ -46,10 +46,10 @@ index 3b2df0411f9ef85445a53292a65f805a80218979..99126888d4ccae266e55ed3d9ed858fb
                          continue;
                      }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index c4f54e9e7ecc03f8417db36d8f463ffe54ead94b..9a2569ebd56ce67fcff7ce6212839d7e1fe002a6 100644
+index 7dcb82b0784816a84557a3842fe6f5f13ec3d5ff..275bfc7d54d89e10749e14522a790f2878d99c2c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -75,6 +75,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -88,6 +88,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public int premiumAccountSlowLoginTimeout = -1;
          // Gale end - make slow login timeout configurable
  

patches/server/0132-Show-last-tick-time-in-tps-command.patch

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 9a2569ebd56ce67fcff7ce6212839d7e1fe002a6..7eb54872b7d9dd6881951963ad7dd8c416c8c229 100644
+index 275bfc7d54d89e10749e14522a790f2878d99c2c..a2a30e4e2dca73e3760e5993d8d02151edd05b32 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -130,6 +130,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -143,6 +143,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
  
          }
  

patches/server/0133-Increase-time-statistics-in-intervals.patch

@@ -87,7 +87,7 @@ index 78e662ef3dbf3e6941be7b8f20ca2a1501ca04e7..f8d90166f76663fdd49b6b2988e0e155
  
          int i = 29999999;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 7eb54872b7d9dd6881951963ad7dd8c416c8c229..049371931a4563755d3f6c082f3e4f0ae2b5835a 100644
+index a2a30e4e2dca73e3760e5993d8d02151edd05b32..48f6e114a3ead68d72f27f9d5572eacbc7613ac3 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -27,7 +27,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart {

patches/server/0140-CPU-cores-estimation.patch

@@ -68,10 +68,10 @@ index b9a799997e3475117ab91d7f3edb5f2f243a9f6b..e23fdd5ba09b50b7eef0ca4f36c54807
  import org.yaml.snakeyaml.constructor.SafeConstructor;
  import org.yaml.snakeyaml.error.MarkedYAMLException;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index 049371931a4563755d3f6c082f3e4f0ae2b5835a..e10f1f7b72a4c52b5b3d3c006f6ae40fbb4e777c 100644
+index 48f6e114a3ead68d72f27f9d5572eacbc7613ac3..7a3111603c75105769cf0fc3ff3c5ee6d45b57e5 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-@@ -172,6 +172,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
+@@ -185,6 +185,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
          public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
          public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
          public boolean playerLoginLocations = true; // Gale - JettPack - make logging login location configurable

patches/server/0145-Base-thread-pools.patch

@@ -1384,7 +1384,7 @@ index 37e0b6212fec71ec9662e6be3b1e8bea487eb4a6..251f098fa2203d06e5e5aa68a31a7653
                      for (Object o : worldData.cache.values() )
                      {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dd3d223b25171db508fe36453c308d6610e78038..a9b544b0da46cd4326455a678a4f7459e93ec621 100644
+index 68e0f2208c5f098042ebfad08301e3154e2a2152..deadeb7a98e5b64d7b9fae3a9e7858a4cd1d39e2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -187,6 +187,8 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -1523,7 +1523,7 @@ index dd3d223b25171db508fe36453c308d6610e78038..a9b544b0da46cd4326455a678a4f7459
              return Optional.empty();
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
-@@ -3285,7 +3283,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3290,7 +3288,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -1908,7 +1908,7 @@ index 69acbab61a79c24312359a63086f9353d740113f..49ace73d901b6f55545bb21a93d026a0
              }
          } catch (Exception ex) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
-index e10f1f7b72a4c52b5b3d3c006f6ae40fbb4e777c..ae192a01c4ef5b4183baf0eee9604619342e6082 100644
+index 7a3111603c75105769cf0fc3ff3c5ee6d45b57e5..e910c998b2195b5f7f8018b8779947504920d514 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
 @@ -2,11 +2,14 @@