Updated Upstream(Folia)

几把的paper次奥

gradle.properties

@@ -9,7 +9,7 @@ release=pre
 # true for push to repo, false for skip push repo, auto for detect by release value
 pushRepo=auto
 
-foliaRef=57f643f10e0a9d01024773232d38ae666067d593
+foliaRef=24c5c95dc45e02caff98a97ed6ffee7565523464
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

shiroha-api/build.gradle.kts.patch

@@ -1,6 +1,15 @@
 --- a/folia-api/build.gradle.kts
 +++ b/folia-api/build.gradle.kts
-@@ -105,17 +_,21 @@
+@@ -109,7 +_,7 @@
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
+ 
+     // checkstyle
+-    checkstyle(project(":folia-checkstyle"))
++    //checkstyle(project(":folia-checkstyle"))
+ }
+ 
+ val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
+@@ -123,17 +_,21 @@
          java {
              srcDir(generatedDir)
              srcDir(file("../paper-api/src/main/java"))
@@ -22,7 +31,7 @@
          }
      }
  }
-@@ -258,4 +_,15 @@
+@@ -276,4 +_,15 @@
  }
  tasks.check {
      dependsOn(scanJarForBadCalls)

shiroha-api/paper-patches/features/0001-Rebrand-to-Shiroha.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand to Shiroha
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index 56a5877181e8d37518b178c95155e892c442e96d..4cab6adb697483ba421d1b9af8d5843ccda410fd 100644
+index 4e099b584c3435ba1ebce492011d35ae1ac0cdf8..92aadf5602049ea22a10625b2a04f3bfef5aae4d 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -19,6 +19,17 @@ public interface ServerBuildInfo {
+@@ -17,6 +17,17 @@ public interface ServerBuildInfo {
       */
      Key BRAND_PAPER_ID = Key.key("papermc", "paper");
  

shiroha-server/build.gradle.kts.patch

@@ -1,13 +1,5 @@
 --- a/folia-server/build.gradle.kts
 +++ b/folia-server/build.gradle.kts
-@@ -12,6 +_,7 @@
- }
- 
- val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
-+val bacteriawaMavenPublicUrl = "https://repo.bacteriawa.com/repository/maven-public/"
- 
- dependencies {
-     mache("io.papermc:mache:26.2+build.1")
 @@ -24,6 +_,7 @@
      gitFilePatches = false
  
@@ -41,17 +33,9 @@
  
  
      updatingMinecraft {
-@@ -44,6 +_,7 @@
-     libraryRepositories.addAll(
-         "https://repo.maven.apache.org/maven2/",
-         paperMavenPublicUrl,
-+        bacteriawaMavenPublicUrl
-     )
- }
- 
 @@ -103,10 +_,14 @@
      main {
-         java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") }
+         java { srcDir("../paper-server/src/main/java") }
          resources { srcDir("../paper-server/src/main/resources") }
 +        java { srcDir("../folia-server/src/main/java") }
 +        resources { srcDir("../folia-server/src/main/resources") }
@@ -102,8 +86,8 @@
 -            "Specification-Vendor" to "Paper Team",
 -            "Brand-Id" to "papermc:folia",
 -            "Brand-Name" to "Folia",
-+            "Specification-Vendor" to "Nanachiyo0721 Community",
++            "Specification-Vendor" to "EilsapMC",
-+            "Brand-Id" to "nanachiyo0721:shiroha",
++            "Brand-Id" to "eilsapmc:shiroha",
 +            "Brand-Name" to "Shiroha",
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
@@ -117,7 +101,7 @@
      versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
      version(paperweight.minecraftVersion)
  
-@@ -366,4 +_,16 @@
+@@ -366,4 +_,15 @@
              }
          }
      }
@@ -132,5 +116,4 @@
 +    compilerArgs.add("-Xlint:-module")
 +    compilerArgs.add("-Xlint:-removal")
 +    compilerArgs.add("-Xlint:-dep-ann")
-+
  }

shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch

@@ -54,10 +54,10 @@ index 35ab432bbd59aba80a6eaca1769e6aa82c8a7e46..9933e59dfebf5d731ea73585c2b08f9e
          } else {entity.inactiveTick();} // Paper - EAR 2
          profiler.pop();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 18b9e630442fd31a14e131bb9043be46e10881e3..f2f3e8474b8f251f4d05bba93784c42f3fd173a3 100644
+index 75dabd3e7b6077b5ae8ee30048786442742b93f9..55263dcdb3ba4d754ad9aa36ce7af3718db98e73 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -387,6 +387,7 @@ public abstract class Entity
+@@ -388,6 +388,7 @@ public abstract class Entity
      public long activatedTick = Integer.MIN_VALUE;
      public boolean isTemporarilyActive;
      public long activatedImmunityTick = Integer.MIN_VALUE;

shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch

@@ -19,10 +19,10 @@ index 297269e18111b93692bdfbc318de6e9e38c18d50..c29167dee1855b142c78d9ae8700b25d
              int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F);
              Entity vehicle = this.getVehicle();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index f2f3e8474b8f251f4d05bba93784c42f3fd173a3..2a6854c4c3ca35807723853128edf16024abbeb7 100644
+index 55263dcdb3ba4d754ad9aa36ce7af3718db98e73..9df6003d325536639706751c109c42eed7904f73 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4195,7 +4195,13 @@ public abstract class Entity
+@@ -4201,7 +4201,13 @@ public abstract class Entity
              }
          }
  
@@ -36,7 +36,7 @@ index f2f3e8474b8f251f4d05bba93784c42f3fd173a3..2a6854c4c3ca35807723853128edf160
              java.util.ArrayDeque<EntityTreeNode> queue = new java.util.ArrayDeque<>();
              queue.add(this);
  
-@@ -4208,14 +4214,24 @@ public abstract class Entity
+@@ -4214,14 +4220,24 @@ public abstract class Entity
  
                  for (EntityTreeNode passenger : passengers) {
                      queue.add(passenger);

shiroha-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch

@@ -17,10 +17,10 @@ index aa53138b3670a8337b639472a6ab5ce46702ff76..6be786dcd9f02c0b59ca90453ddabff9
      }
  
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2a6854c4c3ca35807723853128edf16024abbeb7..cfc080a18816dd10edcf8a3171b18a5cb7174457 100644
+index 9df6003d325536639706751c109c42eed7904f73..d89696bd0a0bd0b7c565b647ea97f24fb7b53ce0 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4455,6 +4455,7 @@ public abstract class Entity
+@@ -4461,6 +4461,7 @@ public abstract class Entity
          Entity copy = this.getType().create(destination, EntitySpawnReason.DIMENSION_TRAVEL);
          copy.restoreFrom(this);
          copy.transform(pos, yaw, pitch, velocity);

shiroha-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch

@@ -8,10 +8,10 @@ On folia, entity usually cannot move out of the tickregion, but sometimes it act
 Reference from : https://github.com/KaiijuMC/Kaiiju/blob/ver/1.20.1/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index cfc080a18816dd10edcf8a3171b18a5cb7174457..3a9d52e8dbb8c4fee3c93213a5997282fa9d68ac 100644
+index d89696bd0a0bd0b7c565b647ea97f24fb7b53ce0..58054c571757eca2e86d53706bed7a2ce5259d6f 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1163,6 +1163,19 @@ public abstract class Entity
+@@ -1164,6 +1164,19 @@ public abstract class Entity
              this.moveStartZ = this.getZ();
              this.moveVector = delta;
          }

shiroha-server/minecraft-patches/features/0023-Fix-folia-nether-portal-ticket-placement.patch

@@ -30,10 +30,10 @@ index ea93ac07ec6d4e83d1d0904daf721132e2bbecc3..947413df55b972a5f866d5717fdb9e92
  
      public static class IntBounds {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 3a9d52e8dbb8c4fee3c93213a5997282fa9d68ac..9308201aaae9c419ed7b2edd09c334ffd8025f50 100644
+index 58054c571757eca2e86d53706bed7a2ce5259d6f..f97c1aa936d1a9b1ea80b701b279b24553d0ecd2 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4719,7 +4719,7 @@ public abstract class Entity
+@@ -4725,7 +4725,7 @@ public abstract class Entity
                              portalInfoCompletable.complete(
                                  new TeleportTransition(destination, Vec3.atCenterOf(targetPos), Vec3.ZERO,
                                      90.0f, 0.0f,
@@ -42,7 +42,7 @@ index 3a9d52e8dbb8c4fee3c93213a5997282fa9d68ac..9308201aaae9c419ed7b2edd09c334ff
                              );
                              return;
                          }
-@@ -4731,7 +4731,7 @@ public abstract class Entity
+@@ -4737,7 +4737,7 @@ public abstract class Entity
                          portalInfoCompletable.complete(
                              net.minecraft.world.level.block.NetherPortalBlock.createDimensionTransition(
                                  destination, portal, originalPortalDirection, relativePos,

shiroha-server/minecraft-patches/features/0029-Reduce-ticket-operations-in-nether-portal-searching.patch

@@ -25,10 +25,10 @@ index 9933e59dfebf5d731ea73585c2b08f9e4ff42d53..01a93a747d2fec6248909165bd450833
  
      // Folia start - region threading
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9308201aaae9c419ed7b2edd09c334ffd8025f50..25a4ce7204c6e7f22a125b81de29be0980c258dd 100644
+index f97c1aa936d1a9b1ea80b701b279b24553d0ecd2..98ce2b377e125c1de123a406c3978f495c5023db 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4738,10 +4738,10 @@ public abstract class Entity
+@@ -4744,10 +4744,10 @@ public abstract class Entity
                  );
  
                  // kick off search for existing portal or creation

shiroha-server/minecraft-patches/features/0034-Async-protocol-switching-optimization.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Async protocol switching optimization
 
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 40f54536422fa38bd84017fc634808016b4de58b..d3fb20f465c0b69662d81b53201963634d8b53d2 100644
+index c3922310ef1fce26eca60793b75bcb480683778a..cc9459273762cde3e6b87a7eaf225607f527315c 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
-@@ -1067,4 +1067,127 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -1108,4 +1108,127 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          }
      }
      // Paper end - Optimize network
@@ -216,10 +216,10 @@ index c86b1fd5e200c478d178be32791b6e8c960d47e2..862a764889ed9ca985afdf672aebeb34
  
      @Override
 diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index f2329d1a9d9d4bf4c9d771e25e54f2f9ef65a76c..1b4229085f9d4189efb20c083bbfe2e6712e72a4 100644
+index 95787d6d29ddb8dca78506bb2a115fa612fdaa29..8c4b60e7c7c44f20e13e917bc0bc3b75e98a36c1 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -435,12 +435,30 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -439,12 +439,30 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
      public void handleLoginAcknowledgement(final ServerboundLoginAcknowledgedPacket packet) {
          net.minecraft.network.protocol.PacketUtils.ensureRunningOnSameThread(packet, this, this.server.packetProcessor()); // CraftBukkit
          Validate.validState(this.state == ServerLoginPacketListenerImpl.State.PROTOCOL_SWITCHING, "Unexpected login acknowledgement packet");

shiroha-server/minecraft-patches/features/0037-Kaiiju-Vanilla-end-portal-teleportation.patch

@@ -8,10 +8,10 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e
 Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 25a4ce7204c6e7f22a125b81de29be0980c258dd..9b5a0c19b5b5dd278ab7db831eef2a97010d7f58 100644
+index 98ce2b377e125c1de123a406c3978f495c5023db..9ed6850abef3afed5694f4862c18b39fbb97d3f2 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4636,15 +4636,19 @@ public abstract class Entity
+@@ -4642,15 +4642,19 @@ public abstract class Entity
                          targetPos, 16, // load 16 blocks to be safe from block physics
                          ca.spottedleaf.concurrentutil.util.Priority.HIGH,
                          (chunks) -> {
@@ -35,7 +35,7 @@ index 25a4ce7204c6e7f22a125b81de29be0980c258dd..9b5a0c19b5b5dd278ab7db831eef2a97
                                      TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
                                      org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL,
                                      TeleportTransition.PassengerTeleportationMode.POSITION_RIDER
-@@ -4660,13 +4664,17 @@ public abstract class Entity
+@@ -4666,13 +4670,17 @@ public abstract class Entity
                          ca.spottedleaf.concurrentutil.util.Priority.HIGH,
                          (chunks) -> {
                              BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos);
@@ -56,7 +56,7 @@ index 25a4ce7204c6e7f22a125b81de29be0980c258dd..9b5a0c19b5b5dd278ab7db831eef2a97
                                      TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
                                      org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL,
                                      TeleportTransition.PassengerTeleportationMode.POSITION_RIDER
-@@ -4845,6 +4853,10 @@ public abstract class Entity
+@@ -4851,6 +4859,10 @@ public abstract class Entity
              return false;
          }
  
@@ -67,7 +67,7 @@ index 25a4ce7204c6e7f22a125b81de29be0980c258dd..9b5a0c19b5b5dd278ab7db831eef2a97
          Vec3 initialPosition = this.position();
          ChunkPos initialPositionChunk = new ChunkPos(
              ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition),
-@@ -4908,9 +4920,14 @@ public abstract class Entity
+@@ -4914,9 +4926,14 @@ public abstract class Entity
                          info.postTeleportTransition().onTransition(teleported);
                      }
  

shiroha-server/minecraft-patches/features/0053-Add-status-bar.patch

@@ -171,10 +171,10 @@ index f03fa06c0ba56f7f5e1e45bc1568a490751efde3..eee1c14249addbf4714df733870da974
 +    // KioCG end
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9b5a0c19b5b5dd278ab7db831eef2a97010d7f58..de6a71616f62c0b1b373840102012cec06703081 100644
+index 9ed6850abef3afed5694f4862c18b39fbb97d3f2..66593eb947035bd9489c4d31a0e9156c1c81b464 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -6428,4 +6428,6 @@ public abstract class Entity
+@@ -6439,4 +6439,6 @@ public abstract class Entity
          return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
      }
      // Paper end

shiroha-server/minecraft-patches/features/0055-Leaves-Lithium-Sleeping-Block-Entity.patch

@@ -240,7 +240,7 @@ index 6e08d50794c4af4405f3e164a3fd46f376b3f78f..dd2d0940eece3e85078e574f66f71a4c
  
      int getContainerSize();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index de6a71616f62c0b1b373840102012cec06703081..ca042e76eb240e0f772dc39fb6aa41c2ceb19f63 100644
+index 66593eb947035bd9489c4d31a0e9156c1c81b464..280d6ff1fcbfb74d194a8ade94c2af02fe2cd41b 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -324,7 +324,7 @@ public abstract class Entity
@@ -252,7 +252,7 @@ index de6a71616f62c0b1b373840102012cec06703081..ca042e76eb240e0f772dc39fb6aa41c2
      private final VecDeltaCodec packetPositionCodec = new VecDeltaCodec();
      public boolean needsSync;
      public boolean syncPosition;
-@@ -4463,11 +4463,13 @@ public abstract class Entity
+@@ -4469,11 +4469,13 @@ public abstract class Entity
      }
  
      protected Entity transformForAsyncTeleport(ServerLevel destination, Vec3 pos, Float yaw, Float pitch, Vec3 velocity) {
@@ -266,7 +266,7 @@ index de6a71616f62c0b1b373840102012cec06703081..ca042e76eb240e0f772dc39fb6aa41c2
          if (copy instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Shiroha - Fix dragon part desync
          // vanilla code used to call remove _after_ copying, and some stuff is required to be after copy - so add hook here
          // for example, clearing of inventory after switching dimensions
-@@ -6034,8 +6036,29 @@ public abstract class Entity
+@@ -6040,8 +6042,29 @@ public abstract class Entity
              this.setBoundingBox(this.makeBoundingBox());
          }
          // Paper end - Block invalid positions and bounding box

shiroha-server/minecraft-patches/features/0067-Leaf-Configurable-vanilla-username-check.patch

@@ -21,7 +21,7 @@ index c4dddd5c66098301de2abc2de93d4409cd14531d..24ccb47605427f83bbfe552edf4d92e9
      private final List<Runnable> tickables = Lists.newArrayList();
      // Paper - per-level GameRules
 diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1b4229085f9d4189efb20c083bbfe2e6712e72a4..822e69a975b5c08547b17f8abfa0d512c70a2625 100644
+index 8c4b60e7c7c44f20e13e917bc0bc3b75e98a36c1..6a423ec8d0b909485cc3fabd554e4431af369c7e 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -167,11 +167,20 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -63,7 +63,7 @@ index 1b4229085f9d4189efb20c083bbfe2e6712e72a4..822e69a975b5c08547b17f8abfa0d512
  
                          gameprofile = ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); // Paper - Add more fields to AsyncPlayerPreLoginEvent
                          ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.name(), gameprofile.id());
-@@ -341,7 +359,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -345,7 +363,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
          server.getPluginManager().callEvent(asyncEvent);
          profile = asyncEvent.getPlayerProfile();
          profile.complete(true); // Paper - setPlayerProfileAPI

shiroha-server/minecraft-patches/features/0069-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Leaves: Disable packet limit & Shiroha: Option to full
 
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index d3fb20f465c0b69662d81b53201963634d8b53d2..4e557a304e2c1c6d581fdf4a8d30c6a23dd945af 100644
+index cc9459273762cde3e6b87a7eaf225607f527315c..ddcb9370b316441a78e95c19bc34812e63a514e2 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -258,8 +258,8 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {

shiroha-server/minecraft-patches/features/0074-Gale-Skip-entity-move-if-movement-is-zero.patch

@@ -10,10 +10,10 @@ VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index ca042e76eb240e0f772dc39fb6aa41c2ceb19f63..df03f3407dea64c2ed4ace9bac96c4aa8281f25f 100644
+index 280d6ff1fcbfb74d194a8ade94c2af02fe2cd41b..ccd7cfb1db04628adda7346ee7f1825c15f70afd 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1152,8 +1152,14 @@ public abstract class Entity
+@@ -1153,8 +1153,14 @@ public abstract class Entity
      private double moveStartY;
      private double moveStartZ;
      // Paper end - detailed watchdog information
@@ -28,7 +28,7 @@ index ca042e76eb240e0f772dc39fb6aa41c2ceb19f63..df03f3407dea64c2ed4ace9bac96c4aa
          final Vec3 originalMovement = delta; // Paper - Expose pre-collision velocity
          // Paper start - detailed watchdog information
          ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -5528,6 +5534,11 @@ public abstract class Entity
+@@ -5534,6 +5540,11 @@ public abstract class Entity
      }
  
      public final void setBoundingBox(final AABB bb) {

shiroha-server/minecraft-patches/features/0079-Gale-For-collision-check-has-physics-before-same-veh.patch

@@ -20,10 +20,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index df03f3407dea64c2ed4ace9bac96c4aa8281f25f..e3f79a6f8489694b1133a611931dcafeb1c79634 100644
+index ccd7cfb1db04628adda7346ee7f1825c15f70afd..8c0f34566f04fdf4d8b595250d7ea52cbd62b7c9 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -2438,8 +2438,8 @@ public abstract class Entity
+@@ -2439,8 +2439,8 @@ public abstract class Entity
      }
  
      public void push(final Entity entity) {
@@ -31,5 +31,5 @@ index df03f3407dea64c2ed4ace9bac96c4aa8281f25f..e3f79a6f8489694b1133a611931dcafe
          if (!this.isPassengerOfSameVehicle(entity)) {
 -            if (!entity.noPhysics && !this.noPhysics) {
                  if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant
-                 double xa = entity.getX() - this.getX();
+                 // Paper start - Add EntityCollideWithEntity Event
-                 double za = entity.getZ() - this.getZ();
+                 if (io.papermc.paper.event.entity.EntityCollideWithEntityEvent.getHandlerList().getRegisteredListeners().length != 0 &&

shiroha-server/minecraft-patches/features/0080-Gale-Skip-negligible-planar-movement-multiplication.patch

@@ -7,10 +7,10 @@ License: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://github.com/GaleMC/Gale
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index e3f79a6f8489694b1133a611931dcafeb1c79634..c6b2baca40ed2a12cf5ae1032f4f610b335cc5af 100644
+index 8c0f34566f04fdf4d8b595250d7ea52cbd62b7c9..18087b6f3f3152c1a9699985e28209a9231e57cd 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1299,8 +1299,17 @@ public abstract class Entity
+@@ -1300,8 +1300,17 @@ public abstract class Entity
                      }
                  }
  

shiroha-server/paper-patches/features/0007-Add-config-to-avoid-of-folia-supported-check.patch

@@ -34,10 +34,10 @@ index 6ef0042a355c65262bdb89dcf151bd644653216d..f009da59c9e54a6660d2f35104c56ac2
          }
          // Folia end - block plugins not marked as supported
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 804ea060fc5dc0d0ab89574a75604cdf911b4e6c..2bccd05d7c131ba98419007bb8688eddecf85643 100644
+index e526b322b7380ac92fea7d630370c2d802b190fe..a1a06fe3522eb22998b96fe23fde826ef2db988d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -393,7 +393,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -395,7 +395,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
          }
  
          // Folia start - block plugins not marked as supported