Add Leaf Bootstrap

Also fixed Ignore terminal provider warning not working

patches/server/0004-Leaf-Bootstrap.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
+Date: Wed, 31 Jul 2024 22:05:21 +0800
+Subject: [PATCH] Leaf Bootstrap
+
+org.bukkit.craftbukkit.Main#main -> LeafBootstrap -> PaperBootstrap -> ...
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 618f4b2e1d012b647b3e7bf359c8ecdd7f159e63..e45a2a0c9e461486d3a70f75630ffbc7443ce04e 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -284,7 +284,8 @@ public class Main {
+
+                 //System.out.println("Loading libraries, please wait...");
+                 //net.minecraft.server.Main.main(options);
+-                io.papermc.paper.PaperBootstrap.boot(options);
++                //io.papermc.paper.PaperBootstrap.boot(options); // Leaf - LeafBoostrap - diff on change
++                org.dreeam.leaf.LeafBootstrap.boot(options); // Leaf - LeafBoostrap
+             } catch (Throwable t) {
+                 t.printStackTrace();
+             }
+diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..316654051b80ac0fd62cf3b7a0e1b91010ec24b7
+--- /dev/null
++++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+@@ -0,0 +1,16 @@
++package org.dreeam.leaf;
++
++import io.papermc.paper.PaperBootstrap;
++import joptsimple.OptionSet;
++
++public class LeafBootstrap {
++
++    public static void boot(final OptionSet options) {
++        runPreBootTasks();
++
++        PaperBootstrap.boot(options);
++    }
++
++    private static void runPreBootTasks() {
++    }
++}

patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch → patches/server/0009-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch

@@ -7,7 +7,7 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 73a763e1752e455f019324330563e2baeb923ce6..a978b017a86da7f9bba80e88982c1c06acf03086 100644
+index 96e7e9ef8bf9ab6902638ac4ba270a1f98a36cdf..6d88b2888d2028cb88e34dce3d7963dd818b58d7 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -233,11 +233,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab

patches/server/0009-Pufferfish-Entity-TTL.patch → patches/server/0010-Pufferfish-Entity-TTL.patch

@@ -7,7 +7,7 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 611cf8f85d479798858477dc5f657a567e32e04d..b22fe825a8556a9ec6cb645b67a4335a6cb7f54e 100644
+index be9815bdf5652a7856fd72d3fca3e2562b2fb8c6..815db5b0a24f1628d646893ebad466dcee2ab0bd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -849,6 +849,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0010-Purpur-Server-Changes.patch → patches/server/0011-Purpur-Server-Changes.patch

@@ -8,7 +8,7 @@ TODO - Dreeam: Check Fix-pufferfish-issues.patch
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 0bd557933cb015dfb3f0ac91974019631101f1d6
+Commit: 72ccfbd343bd2af2df3456d43aa737d6cfe849db
 
 Patches below are removed in this patch:
 Brand changes in Rebrand.patch
@@ -17040,7 +17040,7 @@ index 1f354c6c09bc49e57a69db7cfa4f2a331dd02bdb..b251b057ec6e0bb90d140be8f4d24a6c
      public Collection<GeneratedStructure> getStructures(int x, int z) {
          return this.getStructures(x, z, struct -> true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 618f4b2e1d012b647b3e7bf359c8ecdd7f159e63..260f79affee997adbe8d08f2a2cb3aa68083f497 100644
+index e45a2a0c9e461486d3a70f75630ffbc7443ce04e..9f6027268903c81da4cd1e94cf4ac9fa238440e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -176,6 +176,14 @@ public class Main {

patches/server/0018-Remove-UseItemOnPacket-Too-Far-Check.patch → patches/server/0019-Remove-UseItemOnPacket-Too-Far-Check.patch

@@ -7,7 +7,7 @@ This Check is added in 1.17.x -> 1.18.x that updated by Mojang.
 By removing this check, it gives ability for hackers to use some modules of hack clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7fca156cf43281b64d4f2d521aa73e81ffa7f75b..aba0cf1504f0439514183af9b46c59008d47a0e8 100644
+index 785a2dcfad72126bff078bfd63649da6eb053ad6..0af9de55adff7ccda286b3cbf7ac400b71661f72 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1948,7 +1948,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0021-KeYi-Disable-arrow-despawn-counter-by-default.patch → patches/server/0022-KeYi-Disable-arrow-despawn-counter-by-default.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 76718d966a326ba82a92217a9f0fdf5b17f9d643..46254b2f500ad9bec248cd057c87bc729c592ee0 100644
+index 15b351e23ca2daac2a903d58774f2a9bf3b4b070..9df60b85bb47d25f375132b775163befb36987f7 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -136,7 +136,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0027-Slice-Smooth-Teleports.patch → patches/server/0028-Slice-Smooth-Teleports.patch

@@ -36,7 +36,7 @@ index adb9956f3350f1e58cbe5d26602412c0043e0d62..b309541c4a29015ad51e05bb341462bc
          entityplayer1.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
          entityplayer1.connection.send(new ClientboundSetExperiencePacket(entityplayer1.experienceProgress, entityplayer1.totalExperience, entityplayer1.experienceLevel));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6b285e068cc789fd49a8c0f22ebd98378b6dd86b..39cb0c26e1d7e246a5867ea0915dc87c43777cfe 100644
+index 1f70d832b0287f446722745a65062813e84be566..a5f00869d4636867ce54ddbe18ccabfecaad4d9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1361,6 +1361,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0034-Leaves-Syncmatica-Protocol.patch → patches/server/0035-Leaves-Syncmatica-Protocol.patch

@@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves
 This patch is Powered by Syncmatica (https://github.com/End-Tech/syncmatica)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aba0cf1504f0439514183af9b46c59008d47a0e8..f0105e01f94352dee85f91ca2ae951311f4c052f 100644
+index 0af9de55adff7ccda286b3cbf7ac400b71661f72..87c96fa812aab05caa75c3c9d5eb3243e2ef9f55 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -319,6 +319,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0037-Leaves-Disable-moved-wrongly-threshold.patch → patches/server/0038-Leaves-Disable-moved-wrongly-threshold.patch

@@ -7,7 +7,7 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f0105e01f94352dee85f91ca2ae951311f4c052f..c9cf3499de2809c9983881c88029b39264030f94 100644
+index 87c96fa812aab05caa75c3c9d5eb3243e2ef9f55..798f6bfc0603ad0b76feb1bad53ea4154168f570 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -593,7 +593,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0042-Reduce-canSee-work.patch → patches/server/0043-Reduce-canSee-work.patch

@@ -36,7 +36,7 @@ index 24ed26286c7e3e45279b6b27cd0a432b37fda4b2..83fcdd4d090bfc8801a640b2a5645313
              if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
                  return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 39cb0c26e1d7e246a5867ea0915dc87c43777cfe..8b100977de2aa5e1d7d68442e85584e351f4c03c 100644
+index a5f00869d4636867ce54ddbe18ccabfecaad4d9a..89b2b89fdb93f2b734169524175d3dc42bd7dea3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -638,6 +638,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0047-Reduce-items-finding-hopper-nearby-check.patch → patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch

@@ -24,7 +24,7 @@ index 7db0a4b53f27622ad2fd85a451613fc83ea87052..3a27ef6da3d189f4f2211c9929dc1334
          }
      }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 46254b2f500ad9bec248cd057c87bc729c592ee0..6e5e9526255f5ee38921cb33a3aad15654f0e756 100644
+index 9df60b85bb47d25f375132b775163befb36987f7..af052b2d746ccb28ffff386c63fd839b2fb4df62 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -75,10 +75,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0056-SparklyPaper-Optimize-canSee-checks.patch → patches/server/0057-SparklyPaper-Optimize-canSee-checks.patch

@@ -29,7 +29,7 @@ index 41ab27bdeb3cbc54f71977feda61a3034eed3e9e..200a08d09904c6d5ea85b9e2c0228e61
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4d01b79df543f0e37c756ca31d46c6b38c73d6e2..4231ebf983def7f551ee9bb77cbf4780a3a01ace 100644
+index 89b2b89fdb93f2b734169524175d3dc42bd7dea3..22a7e4392a598cf6fd3aa2900ecfa9e2f6117ec5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -200,7 +200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0067-Block-log4j-rce-exploit-in-chat.patch → patches/server/0068-Block-log4j-rce-exploit-in-chat.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Block log4j rce exploit in chat
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d700c5d6faae6d5229e311a9918fd0c2d231c448..abf2605cd11f36584976b576366c92c71b3e00e2 100644
+index 212074a4e26fd124705bbd4ac7bb4e25f3cbf2f9..fe9fc8f1f738531ead36bf8ccd1181a4df8afe9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2390,6 +2390,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -34,7 +34,7 @@ index d700c5d6faae6d5229e311a9918fd0c2d231c448..abf2605cd11f36584976b576366c92c7
          for (int i = 0; i < message.length(); ++i) {
              if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 675b86360802a19eea84a72aec48392a95fbdb25..7c66e3fea981cc6d3a1407c4cb0900a1a697e567 100644
+index 22a7e4392a598cf6fd3aa2900ecfa9e2f6117ec5..bfd522a70ed440363e3aa41b2855c1fbe0cbaf45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -753,6 +753,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0068-Cache-player-profileResult.patch → patches/server/0069-Cache-player-profileResult.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache player profileResult
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eae49bdd56b3f4ffdc59789be8f150d47c42eb54..93367a64ead53f51e00158ba84fbe5e79d04c132 100644
+index 57b524c602751e6b8be9052b15a7cee6e1447e7e..6e1c71f4073dc4b43787a3f6599453d9db7bf8bb 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -26,6 +26,10 @@ dependencies {

patches/server/0073-Ignore-terminal-provider-warning.patch

@@ -0,0 +1,17 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
+Date: Thu, 2 May 2024 20:21:29 -0400
+Subject: [PATCH] Ignore terminal provider warning
+
+
+diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+index 316654051b80ac0fd62cf3b7a0e1b91010ec24b7..9a9bd633c6ed1b2231d36ef7a285a1f1463ccee4 100644
+--- a/src/main/java/org/dreeam/leaf/LeafBootstrap.java
++++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+@@ -12,5 +12,6 @@ public class LeafBootstrap {
+     }
+
+     private static void runPreBootTasks() {
++        System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
+     }
+ }

patches/server/0073-Fix-console-freeze-above-JAVA-22.patch → patches/server/0074-Fix-console-freeze-above-JAVA-22.patch

@@ -6,15 +6,14 @@ Subject: [PATCH] Fix console freeze above JAVA 22
 Revert to old console provider, Fix https://github.com/PaperMC/Paper/issues/10405
 Solution refers to https://inside.java/2023/07/31/quality-heads-up
 
-diff --git a/src/main/java/io/papermc/paper/PaperBootstrap.java b/src/main/java/io/papermc/paper/PaperBootstrap.java
-index 2a554d152403d30b167c0bece8c9e1a2c8ff0bdf..fb19a2f9e219656aa89f6d82edc64bc0d68c1ff1 100644
---- a/src/main/java/io/papermc/paper/PaperBootstrap.java
-+++ b/src/main/java/io/papermc/paper/PaperBootstrap.java
-@@ -19,6 +19,7 @@ public final class PaperBootstrap {
-         getStartupVersionMessages().forEach(LOGGER::info);
+diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+index 9a9bd633c6ed1b2231d36ef7a285a1f1463ccee4..780affb51ebddcd05729c8e3272e28630bed8077 100644
+--- a/src/main/java/org/dreeam/leaf/LeafBootstrap.java
++++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+@@ -13,5 +13,6 @@ public class LeafBootstrap {
 
+     private static void runPreBootTasks() {
          System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
 +        if (org.galemc.gale.virtualthread.VirtualThreadService.getJavaMajorVersion() >= 22) System.setProperty("jdk.console", "java.base"); // Leaf - Fix console freeze above JAVA 22
-
-         Main.main(options);
      }
+ }

patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch → patches/server/0075-Fix-console-output-display-on-Pterodactyl-panel.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Fix console output display on Pterodactyl panel
 
 Fixed console display issue when the terminal used xterm, should work on Pterodactyl, MCSManager and kind of panel software
 
-diff --git a/src/main/java/io/papermc/paper/PaperBootstrap.java b/src/main/java/io/papermc/paper/PaperBootstrap.java
-index fb19a2f9e219656aa89f6d82edc64bc0d68c1ff1..b4b3264ea7b3f6eb2d693af28a492620026287a8 100644
---- a/src/main/java/io/papermc/paper/PaperBootstrap.java
-+++ b/src/main/java/io/papermc/paper/PaperBootstrap.java
-@@ -20,6 +20,13 @@ public final class PaperBootstrap {
-
+diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+index 780affb51ebddcd05729c8e3272e28630bed8077..2f5122a61af183d6a4c20a175122c228b6e9fc48 100644
+--- a/src/main/java/org/dreeam/leaf/LeafBootstrap.java
++++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
+@@ -14,5 +14,12 @@ public class LeafBootstrap {
+     private static void runPreBootTasks() {
          System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
          if (org.galemc.gale.virtualthread.VirtualThreadService.getJavaMajorVersion() >= 22) System.setProperty("jdk.console", "java.base"); // Leaf - Fix console freeze above JAVA 22
 +        // Leaf start - Fix console output display on Pterodactyl panel
@@ -20,6 +20,5 @@ index fb19a2f9e219656aa89f6d82edc64bc0d68c1ff1..b4b3264ea7b3f6eb2d693af28a492620
 +            System.setProperty("terminal.ansi", "true");
 +        }
 +        // Leaf end - Fix console output display on Pterodactyl panel
-
-         Main.main(options);
      }
+ }

patches/server/0082-Use-caffeine-cache-kickPermission-instead-of-using-g.patch → patches/server/0083-Use-caffeine-cache-kickPermission-instead-of-using-g.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use caffeine cache kickPermission instead of using
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index abf2605cd11f36584976b576366c92c71b3e00e2..c41987b5995e27c9b1f8bb2e8af341315c6f338c 100644
+index fe9fc8f1f738531ead36bf8ccd1181a4df8afe9e..855fa46cbaaa22003f46e0e63292ad0824d23c86 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -339,17 +339,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

patches/server/0088-Optimize-check-nearby-fire-or-lava-on-entity-move.patch → patches/server/0089-Optimize-check-nearby-fire-or-lava-on-entity-move.patch

@@ -7,7 +7,7 @@ Remove stream and remove double Mth.floor() convert
 before 1700ms, after 370ms, in massive stacked minecart test
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a8064df7eeec655aca406739a16c4133e0755bd8..8d9fc30f090efc7509f4e2b74b0d6c30627effbd 100644
+index 0a40cff1da82157487d209e63628387092d0d334..bdf7fbe1e7e18996e387df3b186a6f4db7352769 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1337,9 +1337,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/0090-Cache-CraftEntityType-minecraftToBukkit-convert.patch → patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch

@@ -108,7 +108,7 @@ index 1e7a27bc783e68f9579d4d3c72ec165bde7175b9..72dfd388bb784009ac77ff0c93db56eb
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 56bd3e3e7f36ee048526f3d0c7bf87d158a93fe6..5673f7bcdc75d2a8fc5fc143f18075103842c3d4 100644
+index 233df12bfa5c49137ad50f421bf723100844758f..9019a98a082b9d72e5581ca3f50f45aadcc320e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -83,7 +83,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {