Rebuild patches

patches/api/0001-new-fork-who-dis-Rebrand-to-SparklyPaper.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] new fork who dis - Rebrand to SparklyPaper
 
 
 diff --git a/pom.xml b/pom.xml
-index c441d455e2273b63d2cec136872a5025182d75d6..580736a267ea7d65a04dea020dd3c69963eb4d5e 100644
+index 821df3413345c613eccff158f8081cf9ba848a14..e9e469ab4641f1830dff63b2090139074abaedfa 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,8 +3,8 @@

patches/api/0002-Fix-NotePlayEvent.patch

@@ -1,15 +1,11 @@
-From 502314e373a9e4cf31d1778f63dfaad39b644198 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
 Date: Thu, 11 Feb 2021 11:27:24 +0000
 Subject: [PATCH] Fix NotePlayEvent
 
----
- src/main/java/org/bukkit/Instrument.java      | 29 +++++++++++++++----
- .../org/bukkit/event/block/NotePlayEvent.java |  4 ---
- 2 files changed, 24 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/Instrument.java b/src/main/java/org/bukkit/Instrument.java
-index 92194803..82ddb000 100644
+index 92194803bcdfbcfdb99567835906ce9219eabd04..82ddb0008914d1782d039cf6bd78dd60edc8cec7 100644
 --- a/src/main/java/org/bukkit/Instrument.java
 +++ b/src/main/java/org/bukkit/Instrument.java
 @@ -3,33 +3,34 @@ package org.bukkit;
@@ -80,7 +76,7 @@ index 92194803..82ddb000 100644
       * @return The type ID of this instrument.
       * @deprecated Magic value
 diff --git a/src/main/java/org/bukkit/event/block/NotePlayEvent.java b/src/main/java/org/bukkit/event/block/NotePlayEvent.java
-index a3887067..676b31f6 100644
+index a3887067d1b65fb100ac1407a43c455f5d215510..676b31f6f38d4e85cd4bd16ccf42cbc39a5d8423 100644
 --- a/src/main/java/org/bukkit/event/block/NotePlayEvent.java
 +++ b/src/main/java/org/bukkit/event/block/NotePlayEvent.java
 @@ -58,9 +58,7 @@ public class NotePlayEvent extends BlockEvent implements Cancellable {
@@ -103,6 +99,3 @@ index a3887067..676b31f6 100644
      public void setNote(@NotNull Note note) {
          if (note != null) {
              this.note = note;
--- 
-2.25.1
-

patches/api/0003-More-note-block-events.patch

@@ -1,18 +1,12 @@
-From 10a10970b7e62160a78a4ce2a7a06f73676ba0a6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
 Date: Thu, 11 Feb 2021 13:16:44 +0000
 Subject: [PATCH] More note block events
 
----
- .../event/block/NoteBlockPlaceEvent.java      | 44 ++++++++++
- .../event/block/NoteBlockUpdateEvent.java     | 80 +++++++++++++++++++
- 2 files changed, 124 insertions(+)
- create mode 100644 src/main/java/ml/beancraft/haricot/event/block/NoteBlockPlaceEvent.java
- create mode 100644 src/main/java/ml/beancraft/haricot/event/block/NoteBlockUpdateEvent.java
 
 diff --git a/src/main/java/ml/beancraft/haricot/event/block/NoteBlockPlaceEvent.java b/src/main/java/ml/beancraft/haricot/event/block/NoteBlockPlaceEvent.java
 new file mode 100644
-index 00000000..2a22bb7c
+index 0000000000000000000000000000000000000000..2a22bb7c80884bde59cafaff2b50f99d44504998
 --- /dev/null
 +++ b/src/main/java/ml/beancraft/haricot/event/block/NoteBlockPlaceEvent.java
 @@ -0,0 +1,44 @@
@@ -62,7 +56,7 @@ index 00000000..2a22bb7c
 +}
 diff --git a/src/main/java/ml/beancraft/haricot/event/block/NoteBlockUpdateEvent.java b/src/main/java/ml/beancraft/haricot/event/block/NoteBlockUpdateEvent.java
 new file mode 100644
-index 00000000..c1d8b37c
+index 0000000000000000000000000000000000000000..c1d8b37cb43d09244014963eb73f64e816d2b1cb
 --- /dev/null
 +++ b/src/main/java/ml/beancraft/haricot/event/block/NoteBlockUpdateEvent.java
 @@ -0,0 +1,80 @@
@@ -146,6 +140,3 @@ index 00000000..c1d8b37c
 +        return handlers;
 +    }
 +}
--- 
-2.25.1
-

patches/server/0001-new-fork-who-dis-Rebrand-to-SparklyPaper.patch

@@ -4,105 +4,18 @@ Date: Mon, 22 Feb 2021 17:44:11 -0300
 Subject: [PATCH] new fork who dis - Rebrand to SparklyPaper
 
 
-diff --git a/pom.xml b/pom.xml
-index e83e4241a56fe131a75fe21cc1518992c089da2c..ef6d6019a5782d42ea6cd73f76e01f4e985771de 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1,11 +1,11 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-     <modelVersion>4.0.0</modelVersion>
--    <artifactId>tuinity</artifactId>
-+    <artifactId>sparklypaper</artifactId>
-     <packaging>jar</packaging>
-     <version>1.16.5-R0.1-SNAPSHOT</version>
--    <name>Tuinity-Server</name>
--    <url>https://github.com/Spottedleaf/Tuinity</url>
-+    <name>SparklyPaper-Server</name>
-+    <url>https://github.com/SparklyPower/SparklyPaper</url>
- 
-     <properties>
-         <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-@@ -19,8 +19,8 @@
-     </properties>
- 
-     <parent>
--        <groupId>com.tuinity</groupId>
--        <artifactId>tuinity-parent</artifactId>
-+        <groupId>net.perfectdreams.sparklypaper</groupId>
-+        <artifactId>sparklypaper-parent</artifactId>
-         <version>dev-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
-@@ -183,7 +183,7 @@
- 
-     <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
-     <build>
--        <finalName>tuinity-${minecraft.version}</finalName>
-+        <finalName>sparklypaper-${minecraft.version}</finalName> <!-- SparklyPaper -->
-         <defaultGoal>install</defaultGoal> <!-- Paper -->
-         <plugins>
-             <plugin>
-@@ -191,7 +191,7 @@
-                 <artifactId>gitdescribe-maven-plugin</artifactId>
-                 <version>1.3</version>
-                 <configuration>
--                    <outputPrefix>git-Tuinity-</outputPrefix> <!-- Tuinity -->
-+                    <outputPrefix>git-SparklyPaper-</outputPrefix> <!-- SparklyPaper -->
-                     <scmDirectory>..</scmDirectory>
-                 </configuration>
-                 <executions>
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 255bbd6e48b95c70fad02ba692c64c7579496827..bbe8902b6ace3c2bd9eb49192d9cd855e0a88565 100644
+index 7063f1da3654b382e26b0093ad5d0ff04a2b38c2..b6ee4e6e4c223f61874cc8c5817ed68df29e76b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -24,8 +24,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+@@ -28,8 +28,8 @@ public class PaperVersionFetcher implements VersionFetcher {
      @Nonnull
      @Override
-     public String getVersionMessage(@Nonnull String serverVersion) {
+     public Component getVersionMessage(@Nonnull String serverVersion) {
 -        String[] parts = serverVersion.substring("git-Tuinity-".length()).split("[-\\s]"); // Tuinity
--        String updateMessage = getUpdateStatusMessage("Spottedleaf/Tuinity", GITHUB_BRANCH_NAME, parts[0]); // Tuinity
+-        final Component updateMessage = getUpdateStatusMessage("Spottedleaf/Tuinity", GITHUB_BRANCH_NAME, parts[0]); // Tuinity
 +        String[] parts = serverVersion.substring("git-SparklyPaper-".length()).split("[-\\s]"); // SparklyPaper // Tuinity
-+        String updateMessage = getUpdateStatusMessage("SparklyPower/SparklyPaper", GITHUB_BRANCH_NAME, parts[0]); // SparklyPaper // Tuinity
++        final Component updateMessage = getUpdateStatusMessage("SparklyPower/SparklyPaper", GITHUB_BRANCH_NAME, parts[0]); // SparklyPaper // Tuinity
-         String history = getHistory();
+         final Component history = getHistory();
  
-         return history != null ? history + "\n" + updateMessage : updateMessage;
+         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1768554b00ea0b7a57ebbed1f0bc5d8fd6f02f76..c08b6bfc2861d5ee227424ec5950b9a4d8ba3e5c 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1513,7 +1513,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-     }
- 
-     public String getServerModName() {
--        return "Tuinity"; // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+        return "SparklyPaper"; // SparklyPaper // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-     }
- 
-     public CrashReport b(CrashReport crashreport) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 44524e08bed8897e43e408b6f179bf798fed9b62..0272750bfb233fd3f2ae6a734f539a84a2dd5cb5 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
- 
- public final class CraftServer implements Server {
--    private final String serverName = "Tuinity"; // Paper // Tuinity
-+    private final String serverName = "SparklyPaper"; // SparklyPaper // Paper // Tuinity
-     private final String serverVersion;
-     private final String bukkitVersion = Versioning.getBukkitVersion();
-     private final Logger logger = Logger.getLogger("Minecraft");
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 001b1e5197eaa51bfff9031aa6c69876c9a47960..a299350e03e805bf3ad155ee5380895a4c0e8b14 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.tuinity/tuinity-api/pom.properties"); // Tuinity
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.perfectdreams.sparklypaper/sparklypaper-api/pom.properties"); // SparklyPaper // Tuinity
-         Properties properties = new Properties();
- 
-         if (stream != null) {

patches/server/0002-Fix-NotePlayEvent.patch

@@ -1,14 +1,11 @@
-From 742fb14262501f071993273011de76a2dabb28b5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
 Date: Thu, 11 Feb 2021 11:31:38 +0000
 Subject: [PATCH] Fix NotePlayEvent
 
----
- .../java/net/minecraft/server/BlockNote.java  | 22 ++++++++++++-------
- 1 file changed, 14 insertions(+), 8 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockNote.java b/src/main/java/net/minecraft/server/BlockNote.java
-index df69d00d3..7111ba9c2 100644
+index df69d00d3a38417e53f433cd1eb1f6cf3ec9b55b..7111ba9c2119679cd915895370b2159d90396664 100644
 --- a/src/main/java/net/minecraft/server/BlockNote.java
 +++ b/src/main/java/net/minecraft/server/BlockNote.java
 @@ -39,10 +39,9 @@ public class BlockNote extends Block {
@@ -49,6 +46,3 @@ index df69d00d3..7111ba9c2 100644
      }
  
      @Override
--- 
-2.25.1
-

patches/server/0003-More-note-block-events.patch

@@ -1,14 +1,11 @@
-From 50416a2ef110abe02e86b83bddc08464b8addb81 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
 Date: Thu, 11 Feb 2021 13:17:03 +0000
 Subject: [PATCH] More note block events
 
----
- .../java/net/minecraft/server/BlockNote.java  | 63 ++++++++++++++++---
- 1 file changed, 56 insertions(+), 7 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockNote.java b/src/main/java/net/minecraft/server/BlockNote.java
-index 7111ba9c2..f8261543d 100644
+index 7111ba9c2119679cd915895370b2159d90396664..f8261543df1d602cd41662e15a66352a1219cacb 100644
 --- a/src/main/java/net/minecraft/server/BlockNote.java
 +++ b/src/main/java/net/minecraft/server/BlockNote.java
 @@ -1,5 +1,12 @@
@@ -105,6 +102,3 @@ index 7111ba9c2..f8261543d 100644
              return EnumInteractionResult.CONSUME;
          }
      }
--- 
-2.25.1
-

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

@@ -27,7 +27,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/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 87b66c284208f12e9e7cd1c9950ada8d0fbf26a5..5a717085e16fcb08bcc350463bc9dacedb7bac07 100644
+index d568db532de83a85d5c387121cec151c160f36bf..4bf86d22de3dfb5a98c0fd31f936b566a7be6d38 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3007,7 +3007,7 @@ public abstract class EntityLiving extends Entity {
@@ -40,7 +40,7 @@ index 87b66c284208f12e9e7cd1c9950ada8d0fbf26a5..5a717085e16fcb08bcc350463bc9dace
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 5c3eb4fc7e5aec2ad8d0050673fc8f4d2bff6a71..15f20132d5777c5e0162aa91e6e968e1e8b1cc2d 100644
+index 5ccf6b483fe15d4ad12ce2d3d11e9440ee9e8ab7..ec82d91804eeed49a6ef67a92fd24a06ae7ee3fb 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -44,6 +44,15 @@ public interface IBlockAccess {
@@ -88,7 +88,7 @@ index 2e7721a650c5a351b3584665bd236f92ef577761..b3c2b461b2a654a9e37a57f2f62b3ba8
          return d0 == 0.0D ? 0 : (d0 > 0.0D ? 1 : -1);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 970c1be5477a01ab9c6d79e84c519e22775564ff..50cb45883a2e815bdbf5c1522a8ddbcb124561b3 100644
+index bf06ef09cfd4d7618365249d1332d264d8ff1377..fbe9a9d9721daf78e77736080f0c319c80bd950f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -318,6 +318,91 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0006-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch

@@ -24,10 +24,10 @@ 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/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index 61d88dbaa1f5c543be610ce0914b2c89d8ad40ee..11fbbe86978055ece0cb47eee531093e59f61dcf 100644
+index ecd63281912ae0ed93c5eb5ccb4249833cb23ab1..97825ec914709ca037159c46ecee218a6013ff58 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-@@ -17,8 +17,16 @@ public class ShapelessRecipes implements RecipeCrafting {
+@@ -18,8 +18,16 @@ public class ShapelessRecipes implements RecipeCrafting {
      private final String group;
      private final ItemStack result;
      private final NonNullList<RecipeItemStack> ingredients;
@@ -44,7 +44,7 @@ index 61d88dbaa1f5c543be610ce0914b2c89d8ad40ee..11fbbe86978055ece0cb47eee531093e
          this.key = minecraftkey;
          this.group = s;
          this.result = itemstack;
-@@ -60,6 +68,28 @@ public class ShapelessRecipes implements RecipeCrafting {
+@@ -61,6 +69,28 @@ public class ShapelessRecipes implements RecipeCrafting {
      }
  
      public boolean a(InventoryCrafting inventorycrafting, World world) {

patches/server/0007-Swap-priority-of-checks-in-chunk-ticking.patch

@@ -23,10 +23,10 @@ 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/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d2b50cdc43c737d9fdfdcd7838de24cbca2017e4..a60fc548982e2ddfabd924ce9026762d23071038 100644
+index a77fceac7c9e79a6bac05becc21bcb6bf2a1a7c7..784c800eda8d7a37b900a74dff169d60990c418f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1094,7 +1094,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1097,7 +1097,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          gameprofilerfiller.enter("thunder");
          final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
  

patches/server/0009-Only-check-for-spooky-season-once-an-hour.patch

@@ -20,10 +20,10 @@ 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/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 0a59e02d762a096cb3de62e0f8105cc5a5fab8d4..66aa5009550bcb215536a1ca98334771db193fcb 100644
+index 451ffcfd1fc9fa3091dc2bd697e5d829dcf6443f..f06ffdca027e5477332c6bc0c381264b47633f78 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
-@@ -221,13 +221,22 @@ public class EntityBat extends EntityAmbient {
+@@ -222,13 +222,22 @@ public class EntityBat extends EntityAmbient {
          }
      }
  

patches/server/0010-Optimize-random-calls-in-chunk-ticking.patch

@@ -34,7 +34,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/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8fda4702764e80dae93ef9c0eb53abc198642ab1..0924f6b484468f3cf3c2d405101c0158c12d69e6 100644
+index 8e59a794f6190930cb7bb81a2fe1a1d374dacce7..045b4af6721817b3dbfb05b9aec0bf382de9fcf5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -53,6 +53,18 @@ public class Chunk implements IChunkAccess {
@@ -65,10 +65,10 @@ index 8fda4702764e80dae93ef9c0eb53abc198642ab1..0924f6b484468f3cf3c2d405101c0158
  
      public org.bukkit.Chunk bukkitChunk;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 18270d44185b0ec41b9b6e1d2135e7aae3b33261..e8a6bc2654e840395fee70d79695c5a395a4fc1b 100644
+index b55f7dece329dbb3ff27d57a39c32c69e5baea74..5897d462d350dfbd1464feb92ecf77725651c694 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -973,6 +973,7 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -975,6 +975,7 @@ public class ChunkProviderServer extends IChunkProvider {
              }
              // Paper end - optimize isOutisdeRange
              this.world.getMethodProfiler().enter("pollingChunks");
@@ -77,19 +77,19 @@ index 18270d44185b0ec41b9b6e1d2135e7aae3b33261..e8a6bc2654e840395fee70d79695c5a3
              boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a60fc548982e2ddfabd924ce9026762d23071038..c0b6bd8f01214346c17d819d5d870689900d7719 100644
+index 784c800eda8d7a37b900a74dff169d60990c418f..eca550800e9b0a09421ad29cb6a8b16f61806703 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1084,6 +1084,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1087,6 +1087,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
-     private final com.destroystokyo.paper.util.math.ThreadUnsafeRandom randomTickRandom = new com.destroystokyo.paper.util.math.ThreadUnsafeRandom();
+     private final BiomeBase[] biomeBaseCache = new BiomeBase[1];
-     // Paper end
+     // Tuinity end - optimise chunk ice snow ticking
  
 +    private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Airplane
 +
      public void a(Chunk chunk, int i) { final int randomTickSpeed = i; // Paper
          ChunkCoordIntPair chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
-@@ -1094,7 +1096,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1097,7 +1099,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          gameprofilerfiller.enter("thunder");
          final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
  
@@ -98,12 +98,12 @@ index a60fc548982e2ddfabd924ce9026762d23071038..c0b6bd8f01214346c17d819d5d870689
              blockposition.setValues(this.a(this.a(j, 0, k, 15))); // Paper
              if (this.isRainingAt(blockposition)) {
                  DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
-@@ -1118,7 +1120,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -1121,7 +1123,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
          }
  
          gameprofilerfiller.exitEnter("iceandsnow");
 -        if (!this.paperConfig.disableIceAndSnow && this.randomTickRandom.nextInt(16) == 0) { // Paper - Disable ice and snow // Paper - optimise random ticking
 +        if (!this.paperConfig.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper - Disable ice and snow // Paper - optimise random ticking // Airplane - optimize further random ticking
              // Paper start - optimise chunk ticking
-             this.getRandomBlockPosition(j, 0, k, 15, blockposition);
+             // Tuinity start - optimise chunk ice snow ticking
-             int normalY = chunk.getHighestBlockY(HeightMap.Type.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15);
+             BiomeBase[] biomeCache = this.biomeBaseCache;

patches/server/0011-Don-t-get-entity-equipment-if-not-needed.patch

@@ -20,7 +20,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/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5a717085e16fcb08bcc350463bc9dacedb7bac07..c8b5d56bd58aaf91a89a6ebdb90e87f0d1bd9e29 100644
+index 4bf86d22de3dfb5a98c0fd31f936b566a7be6d38..58af082b95a7eff44e2c71c3609a288a31d28d01 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -815,11 +815,13 @@ public abstract class EntityLiving extends Entity {

patches/server/0014-Reduce-chunk-loading-lookups.patch

@@ -30,10 +30,10 @@ index f53525eb32a6096ae24fd23756b2169d5d39e9d4..a192400f0ea4517c56c473d39e4bd043
          boolean flag1 = iblockdata.getFluid().a((Tag) TagsFluid.WATER);
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a77b1d61b9dcb0a2a27d7e50357eaf44c99a661e..3406ffde3c56d9c35ec18a76af8fb258d4131417 100644
+index 53fd0549c965b2252ad80648d61ff1f7cd2b837a..c7573e1271288bd2b9dfe9801ea8f8804089f6ce 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
-@@ -372,7 +372,10 @@ public final class SpawnerCreature {
+@@ -381,7 +381,10 @@ public final class SpawnerCreature {
      }
  
      private static List<BiomeSettingsMobs.c> a(WorldServer worldserver, StructureManager structuremanager, ChunkGenerator chunkgenerator, EnumCreatureType enumcreaturetype, BlockPosition blockposition, @Nullable BiomeBase biomebase) {

patches/server/0015-Skip-POI-finding-if-stuck-in-vehicle.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Skip POI finding if stuck in vehicle
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorFindPosition.java b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
-index 8d445e9c0875db6cf45e4d8bcfce7cd3d5094d94..bc13f865689058a3c94ee41b8efb4dce5874004b 100644
+index 83702e07dff72b639af32c8ba9e831e58da92a10..3cee87677e0c331c593abb165f962e326d61c8f4 100644
 --- a/src/main/java/net/minecraft/server/BehaviorFindPosition.java
 +++ b/src/main/java/net/minecraft/server/BehaviorFindPosition.java
 @@ -45,6 +45,12 @@ public class BehaviorFindPosition extends Behavior<EntityCreature> {