Watch for blocking base threads

patches/server/0009-Include-time-in-startup-logs.patch

@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Sat, 4 Feb 2023 10:58:12 +0100
+Subject: [PATCH] Include time in startup logs
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 190e17eb28d166aedee06e9578561ba402d1b6d2..fab5d1c1531fa89113bef6d17df8437b0aec4582 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit;
+ 
+ import java.io.File;
+ import java.io.IOException;
++import java.text.DateFormat;
+ import java.text.SimpleDateFormat;
+ import java.util.Arrays;
+ import java.util.Calendar;
+@@ -26,6 +27,26 @@ public class Main {
+     }
+     // Paper end
+ 
++    // Gale start - include time in startup logs
++    private static final DateFormat startupDateFormat = new SimpleDateFormat("hh:mm:ss");
++
++    private static void printlnStartupToSystemOut(String type, String line) {
++        System.out.println("[" + startupDateFormat.format(new Date()) + " " + type + "]: " + line);
++    }
++
++    public static void printlnStartupInfoToSystemOut(String line) {
++        printlnStartupToSystemOut("INFO", line);
++    }
++
++    public static void printlnStartupWarningToSystemOut(String line) {
++        printlnStartupToSystemOut("WARN", line);
++    }
++
++    public static void printlnStartupErrorToSystemOut(String line) {
++        printlnStartupToSystemOut("ERROR", line);
++    }
++    // Gale end - include time in startup logs
++
+     public static void main(String[] args) {
+         // Paper start
+         final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
+@@ -292,13 +313,13 @@ public class Main {
+                     String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
+                     String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
+ 
+-                    System.out.println("System Info: " + javaInfo + " " + osInfo);
++                    printlnStartupInfoToSystemOut("System Info: " + javaInfo + " " + osInfo); // Gale - include time in startup logs
+                 } else {
+-                    System.out.println("Unable to read system info");
++                    printlnStartupInfoToSystemOut("Unable to read system info"); // Gale - include time in startup logs
+                 }
+                 // Paper end
+                 System.setProperty( "library.jansi.version", "Paper" ); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
+-                System.out.println("Loading libraries, please wait...");
++                printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
+                 net.minecraft.server.Main.main(options);
+             } catch (Throwable t) {
+                 t.printStackTrace();

patches/server/0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch

@@ -40,7 +40,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3a116b37a89306ea8f2b7eec867d0e3c3523f74c..6d7f51274537f5041c9f98923bb72b9fc9ddd295 100644
+index 763b3a46e922c3db26507d2975f4b3e105f30838..365a740881e60d86c2ede8b1f498e9222a827f9a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3629,7 +3629,7 @@ public abstract class LivingEntity extends Entity {

patches/server/0028-Cache-on-climbable-check.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6d7f51274537f5041c9f98923bb72b9fc9ddd295..7f4f4f291cbe0281bd4da94bc1f7a16215622e7f 100644
+index 365a740881e60d86c2ede8b1f498e9222a827f9a..e68eef2c5c8d3aea186beb5997122b8371fa11ae 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -64,7 +64,7 @@ index 6d7f51274537f5041c9f98923bb72b9fc9ddd295..7f4f4f291cbe0281bd4da94bc1f7a162
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1b42c98956342832c37f0aa266f85271daa4ba5b..ad1187d2a513dbfd624d15b0663e07c70dc72f3a 100644
+index e881584d38dc354204479863f004e974a0ac6c07..2bff2b6cff78f1ad4cbc6abbc1a37464f543ccb7 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -291,7 +291,7 @@ public class ActivationRange

patches/server/0031-Improve-container-checking-with-a-bitset.patch

@@ -265,7 +265,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..f5bed0f18b2a3dbe7d52c1b83717298f
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index b8fb7b5a347298ada16bc8b818edf1863e3f6040..8de3aa9dae051ef12dc59e761ea8fcaf497bb01e 100644
+index cc74eeb45913fab03e85969957215d2811252a83..33801e0725f023d077dbd91a593453d8af367cc2 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 @@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;

patches/server/0038-Remove-streams-from-getting-nearby-players.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index da40e419a245a43dec75a0cc3028cb0a42087c3f..f5a6da990507e695d9a3c198a6e72dd45906c3e3 100644
+index aaa5af793ae0c177bcde75880445a3eb5970ce23..35affcc64e84c2daca72735271268eebde2eb25f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -488,17 +488,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0041-Reduce-entity-allocations.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f5a6da990507e695d9a3c198a6e72dd45906c3e3..58c3ca0a917803e68701b6ac2ec193133cfe7fe0 100644
+index 35affcc64e84c2daca72735271268eebde2eb25f..22ac029452a24199a90576c9456d4ba5eaaeb594 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -414,6 +414,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 58c3ca0a917803e68701b6ac2ec193133cfe7fe0..9f6dfe81d1c1d1308505eb0d495d63e8b5be246a 100644
+index 22ac029452a24199a90576c9456d4ba5eaaeb594..72a0b1b084aafb8bb07eae4c9587a786766e24f2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4099,16 +4099,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0044-SIMD-support.patch

@@ -13,7 +13,7 @@ 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/build.gradle.kts b/build.gradle.kts
-index ebe3f85542004002713dd327e8a423f2570695ed..f3287cea49ee7352a1065dc65927ab9922d0a9c4 100644
+index 01780a73ee9cc602951bdf568c17673c4c639f79..4b279948e82a6dfd2f471ba698e361dcfe4499de 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -62,6 +62,7 @@ tasks.withType<JavaCompile> {

patches/server/0045-Make-book-writing-configurable.patch

@@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this
 functionality before additional exploits are found.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1192b751c8d00754d40781e714bc3f6330767f75..d31f52ace6dd6a80adb639e1e50f4b547b23103d 100644
+index 547cc76d2086a658cbf667dcd6e47227a0a26b7b..92fc01fb38130fc9c77e47e4b1db99f892d5459f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -182,6 +182,8 @@ import net.minecraft.world.phys.Vec3;

patches/server/0046-Optimize-entity-coordinate-key.patch

@@ -35,7 +35,7 @@ index d1a59c2af0557a816c094983ec60097fb4de060c..3fad7e58a1461d897526d63efd27075f
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9f6dfe81d1c1d1308505eb0d495d63e8b5be246a..ca5b6a05ea3a3005d4a46f8581f498f6aadaee74 100644
+index 72a0b1b084aafb8bb07eae4c9587a786766e24f2..cd705a59d63eaaf090c63f5c3d088db3cb1afa16 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0047-Reduce-in-wall-checks.patch

@@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth
 keeping it.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7f4f4f291cbe0281bd4da94bc1f7a16215622e7f..20f70e0bc085a941a7e5de3ceff968870f23fb5f 100644
+index e68eef2c5c8d3aea186beb5997122b8371fa11ae..6b1fb422d68f3b83fef66a8af997b2140f1d0897 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -400,7 +400,10 @@ public abstract class LivingEntity extends Entity {

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

@@ -13,7 +13,7 @@ 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
+index 92fc01fb38130fc9c77e47e4b1db99f892d5459f..dce5cff1d85ca2dd642219ca2a1adfc2adbae4d6 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

patches/server/0053-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 9e8c1bb48b2453296cd235cc0c127032ebf73053..63b54d47203d796b7dfeac2e6e04ce49b5a72ae5 100644
+index dce5cff1d85ca2dd642219ca2a1adfc2adbae4d6..16a8e3819258e3e42ade5f237e473765b3f8b3c7 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
@@ -40,7 +40,7 @@ index 9e8c1bb48b2453296cd235cc0c127032ebf73053..63b54d47203d796b7dfeac2e6e04ce49
              Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f381bf9064be548a4a603e0042886d8a5e70ba5b..603d87fedf731498ebf516fdda3c785bd01bf830 100644
+index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..601b7cb73af55bdf8fd51c5f73e96a9656576cc2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -322,6 +322,8 @@ public abstract class PlayerList {

patches/server/0055-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 63b54d47203d796b7dfeac2e6e04ce49b5a72ae5..37bf4f356a23224fb5da949e8311c895c3529cf8 100644
+index 16a8e3819258e3e42ade5f237e473765b3f8b3c7..d2a09822104c954f06f64ad2a63012e433088169 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;

patches/server/0061-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 37bf4f356a23224fb5da949e8311c895c3529cf8..03befb9a39b7668ff5ec2e72ab68bbc0dd52f007 100644
+index d2a09822104c954f06f64ad2a63012e433088169..8d9e2573c6d9597699e74f19989dcde600a5fb61 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

patches/server/0068-Make-sand-duping-fix-configurable.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/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 72f1866226269396ba0f0c1be269e237925d9322..ea099989d633764489396a48d52db9f6023a20af 100644
+index eacb8a407fe99af2c13f23c12b5544696bda8890..df8487488bcce6a8ae4cd7c995ab61cae04acbb6 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -130,7 +130,7 @@ public class FallingBlockEntity extends Entity {

patches/server/0081-Optimize-sun-burn-tick.patch

@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca5b6a05ea3a3005d4a46f8581f498f6aadaee74..c8665f26723d315e09a96ff9a7e4688ce131a3e7 100644
+index cd705a59d63eaaf090c63f5c3d088db3cb1afa16..73824358e299c39fe7ea2d07d90ec1e25bb29f2f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -290,7 +290,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0094-Check-frozen-ticks-before-landing-block.patch

@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5c0c1100dc5bec3978f514f4403f9ee2c0352dc9..e5574a6349d3649392be3f001242782a34a0cb57 100644
+index 8ea5861bc9ae59c15ee6db042c769046f74abeed..25829f5b2675e1eafef5f5a0e40db8a4bbc80ba4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -571,11 +571,10 @@ public abstract class LivingEntity extends Entity {

patches/server/0102-Skip-entity-move-if-movement-is-zero.patch

@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c8665f26723d315e09a96ff9a7e4688ce131a3e7..bf3bdbdb4384f374419f00635280305f84ce078c 100644
+index 73824358e299c39fe7ea2d07d90ec1e25bb29f2f..7766e57fe4e15adb7b6b80bf9a5fd763ce1282c2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch

@@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bf3bdbdb4384f374419f00635280305f84ce078c..0ce745f5a00d4db68e8559fc1826dace52ae44d8 100644
+index 7766e57fe4e15adb7b6b80bf9a5fd763ce1282c2..deff1fa31d41445fb796cae8e5e4e3249f235ea0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -869,7 +869,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {