Updated Upstream (Paper)

build.gradle.kts

@@ -59,7 +59,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.9.0:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     paperclip("io.papermc:paperclip:3.0.3")
 }

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=62b220a87f6991c33423346e5f50e64058e7bdd9
+paperRef=00fd87a10fcdfa86db341c051b006303fe068b55
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0005-Gale-branding-changes.patch

@@ -427,7 +427,7 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..e45e6b44b2a8f2cdae6e0048a812b921
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d06185566b447c432d4dc2e3ba04d121bcdbc71b..e909e960005c512c42c7b8643e8f9241695bb81b 100644
+index 93b661e9cb7743aeff7da3972942cb73049a5e4c..9f5192212c492cefee9abd96aec6866e27ceb48e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -952,7 +952,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -445,7 +445,7 @@ index d06185566b447c432d4dc2e3ba04d121bcdbc71b..e909e960005c512c42c7b8643e8f9241
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
                  try {
-@@ -1855,7 +1861,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1865,7 +1871,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {

patches/server/0008-Gale-configuration.patch

@@ -38,7 +38,7 @@ index 7620c72a4c243cbeea245203ce03a97cbfa7d922..29796a404e210f7864f4b33b3367e025
          JSONObject object = new JSONObject();
          for (String key : config.getKeys(false)) {
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index c01b4393439838976965823298f12e4762e72eff..f54620e3f184a978d0b275087c4cc8b1f48e48b9 100644
+index 218bf89fd7583d6db9f64754c4db8fcce5415bdb..2ba577f8d191dc1650ac7945fffdfee7db34b5c6 100644
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
 @@ -6,7 +6,10 @@ import io.papermc.paper.configuration.constraint.Constraint;
@@ -61,7 +61,7 @@ index c01b4393439838976965823298f12e4762e72eff..f54620e3f184a978d0b275087c4cc8b1
          return node -> {
              ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type));
              ObjectMapper.Mutable<T> mutable = (ObjectMapper.Mutable<T>) factory.get(type);
-@@ -166,7 +169,7 @@ public abstract class Configurations<G, W> {
+@@ -167,7 +170,7 @@ public abstract class Configurations<G, W> {
          final YamlConfigurationLoader loader = result.loader();
          final ConfigurationNode node = loader.load();
          if (result.isNewFile()) { // add version to new files
@@ -70,7 +70,7 @@ index c01b4393439838976965823298f12e4762e72eff..f54620e3f184a978d0b275087c4cc8b1
          } else {
              this.verifyWorldConfigVersion(contextMap, node);
          }
-@@ -227,7 +230,7 @@ public abstract class Configurations<G, W> {
+@@ -228,7 +231,7 @@ public abstract class Configurations<G, W> {
              .build();
          final ConfigurationNode worldNode = worldLoader.load();
          if (newFile) { // set the version field if new file
@@ -79,7 +79,7 @@ index c01b4393439838976965823298f12e4762e72eff..f54620e3f184a978d0b275087c4cc8b1
          } else {
              this.verifyWorldConfigVersion(contextMap, worldNode);
          }
-@@ -352,4 +355,25 @@ public abstract class Configurations<G, W> {
+@@ -353,4 +356,25 @@ public abstract class Configurations<G, W> {
              return "ContextKey{" + this.name + "}";
          }
      }
@@ -188,7 +188,7 @@ index 8f23276796037d048eb114952891a01a40971b3e..ac9ceb54b894119cb30a22d37e035e2c
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e909e960005c512c42c7b8643e8f9241695bb81b..261bc188a5788988f4ad31ab1640798d619e1da7 100644
+index 9f5192212c492cefee9abd96aec6866e27ceb48e..295b76c60d9395d0beb234aff5691388bd3fe437 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,9 +3,6 @@ package net.minecraft.server;

patches/server/0014-Use-timin.gs-by-default.patch

@@ -13,10 +13,10 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..53c7802053d01f7d4c92afbd92607605720db7b0 100644
+index f2e30d8743a97c0541808dc5c03300c0d881b843..71f1c1de486a72a6253b69b1a6a0a365faa5b5b4 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -97,7 +97,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -98,7 +98,7 @@ public class GlobalConfiguration extends ConfigurationPart {
      public class Timings extends ConfigurationPart {
          public boolean enabled = true;
          public boolean verbose = true;

patches/server/0015-Recommend-disabling-timings-on-startup.patch

@@ -31,10 +31,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/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 53c7802053d01f7d4c92afbd92607605720db7b0..d840237674c67c739e0f990a89f77a31cb706558 100644
+index 71f1c1de486a72a6253b69b1a6a0a365faa5b5b4..83ecb6402ddedd4a613afef7d3a9ad5a5ac6ae30 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -95,7 +95,10 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -96,7 +96,10 @@ public class GlobalConfiguration extends ConfigurationPart {
  
      @Deprecated(forRemoval = true)
      public class Timings extends ConfigurationPart {
@@ -46,7 +46,7 @@ index 53c7802053d01f7d4c92afbd92607605720db7b0..d840237674c67c739e0f990a89f77a31
          public boolean verbose = true;
          public String url = "https://timin.gs/"; // Gale - use timin.gs by default
          public boolean serverNamePrivacy = false;
-@@ -109,6 +112,13 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -110,6 +113,13 @@ public class GlobalConfiguration extends ConfigurationPart {
  
          @PostProcess
          private void postProcess() {

patches/server/0016-Make-timings-calls-final.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a6c1bd3c37720ff692fb72c8648c3d2eb9247346..216cbb87356fd98ec7015cd31b0fde860ea92672 100644
+index 295b76c60d9395d0beb234aff5691388bd3fe437..2315d736b604ff35aa5bd839f3ea7bbc3f47e31c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1514,7 +1514,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -19,7 +19,7 @@ index a6c1bd3c37720ff692fb72c8648c3d2eb9247346..216cbb87356fd98ec7015cd31b0fde86
          long i = Util.getNanos();
  
          // Paper start - move oversleep into full server tick
-@@ -1576,7 +1576,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1586,7 +1586,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickTime(l - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot

patches/server/0017-Remove-vanilla-profiler.patch

@@ -167,7 +167,7 @@ index 821dc4aeaf48460000682604fba51b340b9738e7..4f4540ed9b3e603eec0d46fb5b58de24
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06ed9de828f 100644
+index 2315d736b604ff35aa5bd839f3ea7bbc3f47e31c..68197cddec15d43f9de373d096be2507e3e36227 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -106,18 +106,9 @@ import net.minecraft.util.RandomSource;
@@ -228,7 +228,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
-@@ -1209,20 +1182,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1219,20 +1192,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
                  boolean flag = i == 0L;
  
@@ -249,7 +249,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
                  this.waitUntilNextTick();
-@@ -1230,8 +1195,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1240,8 +1205,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.tickRateManager.endTickWork();
                  }
  
@@ -258,7 +258,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
                  this.isReady = true;
                  JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
-@@ -1457,7 +1420,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1467,7 +1430,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -266,7 +266,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          super.doRunTask(ticktask);
      }
  
-@@ -1530,7 +1492,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1540,7 +1502,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
@@ -274,7 +274,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
          try {
              this.isSaving = true;
-@@ -1545,7 +1506,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1555,7 +1516,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
@@ -282,7 +282,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          // Paper end - Incremental chunk and player saving
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
-@@ -1558,7 +1518,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1568,7 +1528,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
          // Paper end - Server Tick Events
@@ -290,7 +290,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          long j = Util.getNanos() - i;
          int k = this.tickCount % 100;
  
-@@ -1574,7 +1533,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1584,7 +1543,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          tickTimes60s.add(this.tickCount, j);
          // Paper end - Add tick times API and /mspt command
          this.logTickTime(l - i);
@@ -298,7 +298,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          org.spigotmc.WatchdogThread.tick(); // Spigot
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingFullServerTick(); // Paper // Gale - final timings calls
      }
-@@ -1656,11 +1614,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1666,11 +1624,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -310,7 +310,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
  
          // CraftBukkit start
-@@ -1702,19 +1658,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1712,19 +1668,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
              worldserver.updateLagCompensationTick(); // Paper - lag compensation
  
@@ -330,7 +330,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.tick(shouldKeepTicking);
-@@ -1731,17 +1680,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1741,17 +1690,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -348,7 +348,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
          this.playerList.tick();
          MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
-@@ -1749,15 +1694,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1759,15 +1704,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -364,7 +364,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          iterator = this.playerList.getPlayers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1767,7 +1709,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1777,7 +1719,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              entityplayer.connection.resumeFlushing();
          }
  
@@ -372,7 +372,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -1775,7 +1716,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1785,7 +1726,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void forceTimeSynchronization() {
@@ -380,7 +380,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
          Iterator iterator = this.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1783,8 +1723,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1793,8 +1733,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.synchronizeTime(worldserver);
          }
@@ -389,7 +389,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
      }
  
      public boolean isNetherEnabled() {
-@@ -2448,7 +2386,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2458,7 +2396,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -398,7 +398,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
      }
  
      public abstract boolean isSingleplayerOwner(GameProfile profile);
-@@ -2686,53 +2624,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2696,53 +2634,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // CraftBukkit end
  
@@ -452,7 +452,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
      public Path getWorldPath(LevelResource worldSavePath) {
          return this.storageSource.getLevelPath(worldSavePath);
      }
-@@ -2778,25 +2669,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2788,25 +2679,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.isSaving;
      }
  
@@ -478,7 +478,7 @@ index 4919e1f741e4b1680cb9e3736d8096616adb6def..6f3d488fda697299f604e813b8eaa06e
      public int getMaxChainedNeighborUpdates() {
          return 1000000;
      }
-@@ -2837,56 +2709,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2847,56 +2719,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -1096,7 +1096,7 @@ index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..47e75ec4a01f8a456ec6ebc13031c1f0
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index be2220457e941803b14d78c550d0db777c79a886..df9f72dda34ff4ab87a4324938720dd8d9f82295 100644
+index b2eff51f1ad1e702525ef298807ea7d2083f6218..f222d987a47cc3913c5a48505d272d72c4b4432c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -833,7 +833,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1718,7 +1718,7 @@ index 24044795d8e0f1fb15a4f2f5401f44897092f2a3..5fb3a32991b32132b0db56933671d2f9
              this.assignProfessionWhenSpawned = false;
          }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..bb8d73d4022b1e13bb3e2bcf74b511f64fe476d2 100644
+index 90a82bd7977ebe520bdcc2ab99e11452d5cf4a21..dae299512dd458ec3765f2940505e6b48d99deb0 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -675,7 +675,6 @@ public class Explosion {
@@ -1901,7 +1901,7 @@ index 6ec3fc801453fd54c25b642e6fa71c19b463311d..b02a2ca45152693e9974e802866feaa6
                          if (throwable instanceof ThreadDeath) throw throwable; // Paper
                          // Paper start - Prevent block entity and entity crashes
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
-index eb18494bd7257fa5eb00dea16cf4d5667b796f2b..61d5fe8e5344a6cb94d427859488c34821c8a3f6 100644
+index 8aa4ac3a6affbe888d6084a27b668c58dfda6c79..b70deca077e49da069906d33bb29daab21f0943d 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
 @@ -12,7 +12,6 @@ import java.util.function.Function;

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

@@ -390,7 +390,7 @@ index 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..0d7a80824bf0ce921070dea02220ca65
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 757edf74751dc7183454656fda9cecc4eb601e4c..fc3fd4ac0f833b606757e9334b41311fe6eb8d92 100644
+index cdb739df2a285032d25d84f4464f202a7a3fa578..a2e314549f4b4182a817ecd477235f56fb95c5f5 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -48,7 +48,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -401,7 +401,7 @@ index 757edf74751dc7183454656fda9cecc4eb601e4c..fc3fd4ac0f833b606757e9334b41311f
      private NonNullList<ItemStack> items;
 +    private gg.airplane.structs.ItemListWithBitset optimizedItems;
 +    // Gale end - Airplane - improve container checking with a bitset
-     private int cooldownTime;
+     public int cooldownTime;
      private long tickedGameTime;
  
 @@ -84,14 +87,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

patches/server/0069-Fix-MC-238526.patch

@@ -49,18 +49,23 @@ index 9b897cf53f4bb5d366e6ac88dbed93c59d8fe541..53e3a40246da0a4d30ad8a7286d1a43d
      }
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 867849daa3a3eacaa90caad079234f8aa38d8dcf..1f99a324527d5329a21e795d3b6d95b535f415ef 100644
+index f8a561d91686d6df89a7374ca223972e435978c9..14f4a9fe5e8c185d1d8e6201bff24aabee43a634 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -100,6 +100,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
-         public class Fixes extends ConfigurationPart {
-             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
+@@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+     public GameplayMechanics gameplayMechanics;
+     public class GameplayMechanics extends ConfigurationPart {
  
++        public Fixes fixes;
++        public class Fixes extends ConfigurationPart {
++
 +            // Gale start - Purpur - fix MC-238526
 +            @Setting("mc-238526")
 +            public boolean mc238526 = false;
 +            // Gale end - Purpur - fix MC-238526
 +
-         }
- 
++        }
++
          public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
+         public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
+ 

patches/server/0069-Make-tripwire-duping-fix-configurable.patch

@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
-Date: Sun, 6 Nov 2022 04:32:27 -0500
-Subject: [PATCH] Make tripwire duping fix configurable
-
-License: MIT (https://opensource.org/licenses/MIT)
-Leaf - https://github.com/Winds-Studio/Leaf
-
-diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-index 3cb1db27dba902678a5848a1fb5e2c6ec6241e60..c615d528610168c4ad52730079f3525ab211b89e 100644
---- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
-@@ -91,7 +91,7 @@ public class TripWireBlock extends Block {
-     public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) {
-         if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating
-         if (!moved && !state.is(newState.getBlock())) {
--            this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), true); // Paper - fix tripwire state inconsistency
-+            this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), world.galeConfig().gameplayMechanics.fixes.tripwireDuping); // Paper - fix tripwire state inconsistency // Gale - Leaf - make tripwire duping fix configurable
-         }
-     }
- 
-diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index f8a561d91686d6df89a7374ca223972e435978c9..867849daa3a3eacaa90caad079234f8aa38d8dcf 100644
---- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -96,6 +96,12 @@ public class GaleWorldConfiguration extends ConfigurationPart {
-     public GameplayMechanics gameplayMechanics;
-     public class GameplayMechanics extends ConfigurationPart {
- 
-+        public Fixes fixes;
-+        public class Fixes extends ConfigurationPart {
-+            public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
-+
-+        }
-+
-         public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
-         public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
- 

patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch

@@ -64,14 +64,15 @@ index 161c128d27f50f145f88142191f1a5c93649ea65..6659abb4ab8a13a48c154d2e3f273eb1
                      entitycow.setPersistenceRequired();
                  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 1f99a324527d5329a21e795d3b6d95b535f415ef..34d9b53148d377d683d526ebc664aad3f0ee9c9a 100644
+index 14f4a9fe5e8c185d1d8e6201bff24aabee43a634..223983565d08c0a803afb27433aee31a4267c364 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -99,6 +99,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
          public Fixes fixes;
          public class Fixes extends ConfigurationPart {
-             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
-+            public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
  
++            public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
++
              // Gale start - Purpur - fix MC-238526
              @Setting("mc-238526")
+             public boolean mc238526 = false;

patches/server/0071-Fix-MC-121706.patch

@@ -65,7 +65,7 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251
              }
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 34d9b53148d377d683d526ebc664aad3f0ee9c9a..08c9d6ac15163679b07aef611e7d31ddb8cf9489 100644
+index 223983565d08c0a803afb27433aee31a4267c364..bcb7e0feda3aafd9a0c7e4a7ed41c867081df693 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0072-Fix-MC-110386.patch

@@ -35,7 +35,7 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d
      }
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 08c9d6ac15163679b07aef611e7d31ddb8cf9489..39703c8ffbd5b41a1b010f197908237d1078c015 100644
+index bcb7e0feda3aafd9a0c7e4a7ed41c867081df693..cb1e4ec01764c1be430ae45937706862a74afd26 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0073-Fix-MC-31819.patch

@@ -35,7 +35,7 @@ index 567704f61034363e48ef2a5b5566ebdc91682297..e1b2b6a55d0a837d2a447dcc636a9f29
          if (!this.abilities.invulnerable) {
              if (!this.level().isClientSide) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 39703c8ffbd5b41a1b010f197908237d1078c015..9abfdc9e1725b37987b661cd89b32cc43595396f 100644
+index cb1e4ec01764c1be430ae45937706862a74afd26..7f9c5012defeac5ae558e46d8fca6889fb1d0872 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch

@@ -49,12 +49,12 @@ index 098fde8200a11f91f934ddab6b1486dac4014dfe..083130de6f6d5b6daa1564d5d51115f7
  
              blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 9abfdc9e1725b37987b661cd89b32cc43595396f..01cc8c68e73392db88bd79e7fabd54a4262164b1 100644
+index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..56bf02a1f9741fc1c05ede0c0c79fea97d46271b 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -100,6 +100,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
          public class Fixes extends ConfigurationPart {
-             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
+ 
              public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
 +            public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal
  

patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch

@@ -55,7 +55,7 @@ index e8faca6e443239968f0111519f9e5cd018ed3297..488a98e20b4f405d1ce4a224d2d2b515
  
      @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 01cc8c68e73392db88bd79e7fabd54a4262164b1..9660c8f7b3c87001caa7c1ddf5dbac9e7dc5feff 100644
+index 56bf02a1f9741fc1c05ede0c0c79fea97d46271b..0f205f02ce0553fb1f8db8aa903861102a570708 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -124,6 +124,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

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

@@ -355,7 +355,7 @@ index 4716f8bd8a64d4f20f0d5957c1e7fabf63020f43..9e37578ac79a63bb72cc04aae7ba4f6f
  
          if (enumprotocoldirection != this.receiving) {
 diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
-index 084ffde43447f6ff5e45e9fe3fc6a86bde65fd5a..4eafe7ee45f9dc071a8d0a7a4fa9b0800334d995 100644
+index 981d34dd4cfbc0932b147688751b98552c8beea8..53d80d46a857297987145fd956c8136b46185446 100644
 --- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
 +++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java
 @@ -15,6 +15,8 @@ import java.util.function.Consumer;

patches/server/0079-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 f369a104d147205520f3e89dccd6180db0773121..36045fcebdf2f8d0a918fc831fb49c094cc3b527 100644
+index dcee4af35f44f0dfe35ca95551cabedae4ea9f9e..7db079ab7670be9cfb72c3f2efa492fabb469405 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -308,7 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0099-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 36045fcebdf2f8d0a918fc831fb49c094cc3b527..4fce39620c09189645d1c92311bba06c10b853f1 100644
+index 7db079ab7670be9cfb72c3f2efa492fabb469405..4f34ca69a0f417028bad01f4a29644a1e08bb9ca 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0103-Optimize-sheep-offspring-color.patch

@@ -110,7 +110,7 @@ index 1d80678f7e8f658e43616f0baf723f096a99122a..865f244de1605303f22d8944174b0fe0
          DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
          CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 9660c8f7b3c87001caa7c1ddf5dbac9e7dc5feff..046957e51aa09f38f44e2ad0e48f7e2e254ec78e 100644
+index 0f205f02ce0553fb1f8db8aa903861102a570708..19115238d0fd845a788446d88d9ec9a52762c367 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0104-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 4fce39620c09189645d1c92311bba06c10b853f1..8d2820243903352ead1a584cfb4079a22b44be8b 100644
+index 4f34ca69a0f417028bad01f4a29644a1e08bb9ca..b4d78f2609a58e4aba0340ebfce229bb78135475 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -891,7 +891,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -31,7 +31,7 @@ index 4fce39620c09189645d1c92311bba06c10b853f1..8d2820243903352ead1a584cfb4079a2
  
          this.firstTick = false;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 046957e51aa09f38f44e2ad0e48f7e2e254ec78e..d6d2a8b922fe06fc00090acb2ea06cb8d70eb88e 100644
+index 19115238d0fd845a788446d88d9ec9a52762c367..5d499e77800466210473e36b2355873807b9f86a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -127,6 +127,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

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

@@ -86,7 +86,7 @@ index f46c16dd6ff9cd09ea579eecf99ce78c7eb39d49..430b8a2bb1639eeb7338e0f7b1030248
  
      private void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index d6d2a8b922fe06fc00090acb2ea06cb8d70eb88e..fe008b7e8033fcf5793d4ab8f6929a3c2dfe2a94 100644
+index 5d499e77800466210473e36b2355873807b9f86a..c5b23bafb7909130a8a294e3b5bf94daa313ee11 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -9,6 +9,7 @@ import io.papermc.paper.configuration.PaperConfigurations;

patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 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 8d2820243903352ead1a584cfb4079a22b44be8b..fa3084c310903824f8e266879251c5aaefc0c1e7 100644
+index b4d78f2609a58e4aba0340ebfce229bb78135475..c445d59036c9de418997ad3be9bc3912e8fefff4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3712,6 +3712,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -31,7 +31,7 @@ index 8d2820243903352ead1a584cfb4079a22b44be8b..fa3084c310903824f8e266879251c5aa
                      entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - EntityPortalExitEvent
                      entity.setDeltaMovement(velocity); // Paper - EntityPortalExitEvent
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index fe008b7e8033fcf5793d4ab8f6929a3c2dfe2a94..7f1be08866a4369855573f5fa3bf5397d5923f45 100644
+index c5b23bafb7909130a8a294e3b5bf94daa313ee11..f6e4fada132faeb37c076013ef7c54147de42ba8 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -126,6 +126,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch

@@ -34,7 +34,7 @@ index ed80960777b18faca2d6a99783e53daf5fa19e09..3380125f68b865977ac6275796158204
  
                                          if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 7f1be08866a4369855573f5fa3bf5397d5923f45..2919c7727d331dde6fc4dfd94e57fe2abaf9dc78 100644
+index f6e4fada132faeb37c076013ef7c54147de42ba8..bc8af8c6b5f0d4717317e072b3be7348b2eeee76 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -93,6 +93,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fa3084c310903824f8e266879251c5aaefc0c1e7..5ef482feccab75880e908b7ba511f3e324fd32a9 100644
+index c445d59036c9de418997ad3be9bc3912e8fefff4..3245cbbd3b5c14e234a4b79279792b961c45ebd1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4624,6 +4624,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -79,7 +79,7 @@ index 6560fda6525dceddc91b95c8dd82b10debd6b62f..9b33b8b6aa769aceeb8080814b0682cb
              if (iblockdata.is(BlockTags.CLIMBABLE)) {
                  this.lastClimbablePos = Optional.of(blockposition);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 2919c7727d331dde6fc4dfd94e57fe2abaf9dc78..fdb02c7d0f0d5d9e954b564581293688edd99f36 100644
+index bc8af8c6b5f0d4717317e072b3be7348b2eeee76..9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch

@@ -38,13 +38,13 @@ index 06b9fdd33fe888d298dfd24a67702a610233f10d..8d7cda352d1be1bd7638561d4727df9c
  
      @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index fdb02c7d0f0d5d9e954b564581293688edd99f36..fb8ea1f6eaa26c4b72ba7952d189edb42bf8ae2f 100644
+index 9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9..b736cef3509b1f6c7c6135c0f9e5d29f35c82053 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -107,6 +107,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
          public Fixes fixes;
          public class Fixes extends ConfigurationPart {
-             public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
+ 
 +            public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted
              public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
              public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal

patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch

@@ -36,7 +36,7 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..9e4d0493aa814a392742c9ddc1815211
              } else {
                  this.wantedX = vec3.x;
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index fb8ea1f6eaa26c4b72ba7952d189edb42bf8ae2f..633bc62a41b2bc34496a507da9fe0e2eec10468d 100644
+index b736cef3509b1f6c7c6135c0f9e5d29f35c82053..2b8f53fc53dc69aa9afd516ef4a81ecf7b43e62c 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -139,6 +139,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {

patches/server/0124-5-second-TPS-average.patch

@@ -59,7 +59,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7c32c60100cf2bd109eb8762efa856c1
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6f3d488fda697299f604e813b8eaa06ed9de828f..c8f751ab99e7c9995f1d45193c9e9ddf52b944c1 100644
+index 68197cddec15d43f9de373d096be2507e3e36227..20dcfac0f5f03a88a270628ea648278469220ba5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1055,6 +1055,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -70,7 +70,7 @@ index 6f3d488fda697299f604e813b8eaa06ed9de828f..c8f751ab99e7c9995f1d45193c9e9ddf
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1167,6 +1168,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1177,6 +1178,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
                      final long diff = currentTime - tickSection;
                      final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

patches/server/0125-Measure-last-tick-time.patch

@@ -23,7 +23,7 @@ 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/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8f751ab99e7c9995f1d45193c9e9ddf52b944c1..97f310630403427faa6c3e9b954f09367c596b7a 100644
+index 20dcfac0f5f03a88a270628ea648278469220ba5..0896f1071475892d545c486b45c5ab6e5ddb885b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1105,6 +1105,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -38,7 +38,7 @@ index c8f751ab99e7c9995f1d45193c9e9ddf52b944c1..97f310630403427faa6c3e9b954f0936
      protected void runServer() {
          try {
              long serverStartTime = Util.getNanos(); // Paper
-@@ -1187,9 +1192,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1197,9 +1202,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
                  lastTick = currentTime;
                  this.nextTickTimeNanos += i;
@@ -50,7 +50,7 @@ index c8f751ab99e7c9995f1d45193c9e9ddf52b944c1..97f310630403427faa6c3e9b954f0936
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
                  this.waitUntilNextTick();
-@@ -1301,9 +1308,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1311,9 +1318,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void waitUntilNextTick() {
          //this.executeAll(); // Paper - move this into the tick method for timings

patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch

@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 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 5ef482feccab75880e908b7ba511f3e324fd32a9..8019a20da6c0eab22ff155db25427cf8b28a0be4 100644
+index 3245cbbd3b5c14e234a4b79279792b961c45ebd1..3bf982bddffd07c9dd0e25d406bbfcf18d317c27 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2135,8 +2135,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0130-Skip-negligible-planar-movement-multiplication.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8019a20da6c0eab22ff155db25427cf8b28a0be4..4027ea7cb55dcb70c96cc2ada3b0da09c1dda8ad 100644
+index 3bf982bddffd07c9dd0e25d406bbfcf18d317c27..c1f87d2da49b3bae64a4ac1a3da11315ec8d6f01 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1252,9 +1252,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0134-Reduce-RandomSource-instances.patch

@@ -96,7 +96,7 @@ index ea0df00966cf9900a8a0153099bbb04e5b47116d..1168465f6b9414b08680660413c62967
          this.level = world;
          this.id = nbt.getInt("Id");
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index bb8d73d4022b1e13bb3e2bcf74b511f64fe476d2..aa784c1794b80b57fd9c1d738a744e0a8ab39d03 100644
+index dae299512dd458ec3765f2940505e6b48d99deb0..e2cb206841b346ace1f392d63790fcec03d57076 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -92,7 +92,7 @@ public class Explosion {

patches/server/0139-Server-thread-priority-environment-variable.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 97f310630403427faa6c3e9b954f09367c596b7a..fbdc65a01b04abae4c3770666c6a77e0e85be502 100644
+index 0896f1071475892d545c486b45c5ab6e5ddb885b..b45ea40d21859662ee0e44f07cf96c94e1ce61f3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -182,6 +182,8 @@ import co.aikar.timings.MinecraftTimings; // Paper