From 55b133a058271aaccf891aba83fa5df7ead51c3e Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Wed, 21 Feb 2024 13:55:54 +0800
Subject: [PATCH] Update Paper
---
gradle.properties | 2 +-
patches/api/0001-Leaves-Server-Config.patch | 4 ++--
patches/api/0003-Add-fakeplayer-api.patch | 12 ++++++------
.../api/0009-Force-peaceful-mode-switch.patch | 8 ++++----
patches/api/0010-Replay-Mod-API.patch | 12 ++++++------
patches/server/0001-Build-changes.patch | 14 +++++++-------
patches/server/0002-Delete-Timings.patch | 16 ++++++++--------
patches/server/0003-Leaves-Server-Utils.patch | 8 ++++----
.../0004-Update-version-fetcher-repo.patch | 4 ++--
.../0005-Leaves-Server-Config-And-Command.patch | 12 ++++++------
patches/server/0006-Leaves-Protocol-Core.patch | 6 +++---
.../server/0007-Fix-gravity-block-duper.patch | 6 +++---
patches/server/0010-Fakeplayer-support.patch | 14 +++++++-------
...13-Add-isShrink-to-EntityResurrectEvent.patch | 6 +++---
patches/server/0021-Optimize-suffocation.patch | 6 +++---
...033-Cache-climbing-check-for-activation.patch | 4 ++--
...educe-entity-fluid-lookups-if-no-fluids.patch | 6 +++---
patches/server/0037-PCA-sync-protocol.patch | 6 +++---
.../server/0048-Return-nether-portal-fix.patch | 6 +++---
...able-distance-check-for-UseItemOnPacket.patch | 4 ++--
patches/server/0064-Creative-fly-no-clip.patch | 10 +++++-----
.../0069-Elytra-aeronautics-no-chunk-load.patch | 12 ++++++------
.../server/0072-No-block-update-command.patch | 4 ++--
patches/server/0077-SIMD-support.patch | 6 +++---
.../server/0088-Reduce-array-allocations.patch | 14 +++++++-------
patches/server/0089-Optimize-sun-burn-tick.patch | 6 +++---
.../server/0091-Use-optimized-collection.patch | 4 ++--
...Check-frozen-ticks-before-landing-block.patch | 4 ++--
...96-Skip-entity-move-if-movement-is-zero.patch | 6 +++---
...gligible-planar-movement-multiplication.patch | 4 ++--
.../server/0104-Force-peaceful-mode-switch.patch | 4 ++--
patches/server/0106-Replay-Mod-API.patch | 16 ++++++++--------
.../0119-Disable-moved-wrongly-threshold.patch | 6 +++---
.../server/0124-Linear-region-file-format.patch | 6 +++---
...0134-Fix-falling-block-s-block-location.patch | 4 ++--
35 files changed, 131 insertions(+), 131 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 4fa8dab2..263c4fed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT
mcVersion=1.20.4
packageVersion=1_20_R3
org.gradle.jvmargs=-Xmx2G
-paperRef=cde5587e58f08ce2d8875bb9d13a4be56825e353
+paperRef=4939f8711884901ddf1c56337f606de71cdae78d
preVersion=false
updatingMinecraft=false
\ No newline at end of file
diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch
index e0d29c1c..e6d81d3e 100644
--- a/patches/api/0001-Leaves-Server-Config.patch
+++ b/patches/api/0001-Leaves-Server-Config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9af4bc16da09e59009c47911219e99450cdf2aa5..2d59fffd32299af90c7fa9579d8ce667ec9642b2 100644
+index b4f8281d3797ec825a7671f38077cd65d5a1d76e..127a59fdf5318f6cb22b159fc5a5089d3ed2ac96 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2197,6 +2197,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2213,6 +2213,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
throw new UnsupportedOperationException("Not supported yet.");
}
// Paper end
diff --git a/patches/api/0003-Add-fakeplayer-api.patch b/patches/api/0003-Add-fakeplayer-api.patch
index ad50bcad..c6b0a636 100644
--- a/patches/api/0003-Add-fakeplayer-api.patch
+++ b/patches/api/0003-Add-fakeplayer-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer api
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 48fab492609e0bae459d20cc2eae78b87e37ab75..d3efd7baa57135aafe840f9de06f42b73e1e4447 100644
+index ca27559cf4aa1c2e44fdca2022e213b1b1c80f4e..95683959badb5242a05157cd2f7c867d94045f6c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -58,6 +58,7 @@ import org.jetbrains.annotations.Contract;
+@@ -59,6 +59,7 @@ import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import io.papermc.paper.util.JarManifests; // Paper
@@ -16,7 +16,7 @@ index 48fab492609e0bae459d20cc2eae78b87e37ab75..d3efd7baa57135aafe840f9de06f42b7
/**
* Represents the Bukkit core, for version and Server singleton handling
-@@ -2838,6 +2839,17 @@ public final class Bukkit {
+@@ -2858,6 +2859,17 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -35,10 +35,10 @@ index 48fab492609e0bae459d20cc2eae78b87e37ab75..d3efd7baa57135aafe840f9de06f42b7
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2d59fffd32299af90c7fa9579d8ce667ec9642b2..c3f30fcf4bafd61331aeffab9539c86a0220f85d 100644
+index 127a59fdf5318f6cb22b159fc5a5089d3ed2ac96..3af4b686076a3963a95f4768101f382dfa63625c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -58,6 +58,7 @@ import org.bukkit.util.CachedServerIcon;
+@@ -59,6 +59,7 @@ import org.bukkit.util.CachedServerIcon;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -46,7 +46,7 @@ index 2d59fffd32299af90c7fa9579d8ce667ec9642b2..c3f30fcf4bafd61331aeffab9539c86a
/**
* Represents a server implementation.
-@@ -2489,4 +2490,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2505,4 +2506,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API
diff --git a/patches/api/0009-Force-peaceful-mode-switch.patch b/patches/api/0009-Force-peaceful-mode-switch.patch
index 5774f294..b6620b55 100644
--- a/patches/api/0009-Force-peaceful-mode-switch.patch
+++ b/patches/api/0009-Force-peaceful-mode-switch.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index efa2043e044b0e461780e808c347d6ec00f6da0a..359e96f0fc9b9a909351478a0f30e441004c9b3e 100644
+index c5fe36050eeaff80cfb989fe2f38370215af6fe5..37b96ba07ecd03fafd5c42ce8ab4a764390ae9ee 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -4240,6 +4240,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4281,6 +4281,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
void setSendViewDistance(int viewDistance);
// Paper end - view distance api
@@ -19,5 +19,5 @@ index efa2043e044b0e461780e808c347d6ec00f6da0a..359e96f0fc9b9a909351478a0f30e441
+ // Leaves end - unsupported settings
+
/**
- * Represents various map environment types that a world may be
- */
+ * Gets all generated structures that intersect the chunk at the given
+ * coordinates.
diff --git a/patches/api/0010-Replay-Mod-API.patch b/patches/api/0010-Replay-Mod-API.patch
index 93e299bd..1ede61b1 100644
--- a/patches/api/0010-Replay-Mod-API.patch
+++ b/patches/api/0010-Replay-Mod-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Replay Mod API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7b5bb4b8075206c4e8a6854e42ab11e571aaf0b2..13c64a50e1dbdec5b621d059b37d67d728669bd4 100644
+index 95683959badb5242a05157cd2f7c867d94045f6c..094894812b693a33d8dff4d12e3722441734e358 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -59,6 +59,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -60,6 +60,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import io.papermc.paper.util.JarManifests; // Paper
import top.leavesmc.leaves.entity.BotManager;
@@ -16,7 +16,7 @@ index 7b5bb4b8075206c4e8a6854e42ab11e571aaf0b2..13c64a50e1dbdec5b621d059b37d67d7
/**
* Represents the Bukkit core, for version and Server singleton handling
-@@ -2849,6 +2850,11 @@ public final class Bukkit {
+@@ -2869,6 +2870,11 @@ public final class Bukkit {
return server.getBotManager();
}
// Leaves end - Bot API
@@ -29,10 +29,10 @@ index 7b5bb4b8075206c4e8a6854e42ab11e571aaf0b2..13c64a50e1dbdec5b621d059b37d67d7
@NotNull
public static Server.Spigot spigot() {
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c3f30fcf4bafd61331aeffab9539c86a0220f85d..0162f771532a6899a60dc56b2effdd259fd3b2e4 100644
+index 3af4b686076a3963a95f4768101f382dfa63625c..edbcf063790cb2e86c176f6b20a272b2d813b64b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -59,6 +59,7 @@ import org.jetbrains.annotations.Contract;
+@@ -60,6 +60,7 @@ import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import top.leavesmc.leaves.entity.BotManager;
@@ -40,7 +40,7 @@ index c3f30fcf4bafd61331aeffab9539c86a0220f85d..0162f771532a6899a60dc56b2effdd25
/**
* Represents a server implementation.
-@@ -2499,4 +2500,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2515,4 +2516,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull BotManager getBotManager();
// Leaves end - Bot API
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 47a634da..1b348f26 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
-index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..f5c83d033a8163786f8f7e98655e65bb606bc9dc 100644
+index ce3747d8d2a8f4327766cf23d5aaa72cfcb380bc..25408f536cef272f2457e29fe4bff98fa285f363 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -23,7 +23,7 @@ index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..f5c83d033a8163786f8f7e98655e65bb
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -57,19 +61,29 @@ dependencies {
+@@ -58,19 +62,29 @@ dependencies {
}
val craftbukkitPackageVersion = "1_20_R3" // Paper
@@ -55,7 +55,7 @@ index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..f5c83d033a8163786f8f7e98655e65bb
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
-@@ -153,7 +167,7 @@ fun TaskContainer.registerRunTask(
+@@ -154,7 +168,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider = register(name) {
@@ -153,7 +153,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c5
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 90ae7e8c81f6a9ede8aeaeec3bf784023522cefc..b6058a9a51f0be9cf36e3226023e6b2f61c7e82b 100644
+index d06185566b447c432d4dc2e3ba04d121bcdbc71b..41ae5cccc1388c27a88ab9d142d3e4834c5ab97d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop public
org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
@@ -1586,7 +1586,7 @@ index a7e40f72a3b56916620a7f089410ec3a6db0cffc..3ac6943913c887b14078aabb2581f7f1
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
-@@ -2408,20 +2407,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2404,20 +2403,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -1664,10 +1664,10 @@ index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..22d19f1ca47a79be2c41775c5564535b
return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6523795e715e5d472739e9bc6433143115c3de8f..179d96358f935a7717c6a7a4cd6e64b60d76bb34 100644
+index aceee33eebd4d5f89e62a42910ec51843f33843b..371cd5423f0e8f84b5ddef8f1d98e4889b1b4361 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -141,7 +141,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
+@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
import org.bukkit.event.player.PlayerItemConsumeEvent;
// CraftBukkit end
@@ -2093,10 +2093,10 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 8036ed91714d638eb2a8e8c2bea4bf62bc18cb57..2a84a653f8b10525f9f6667273295cf92ed71cb1 100644
+index 1324f05de8106032ce290e928cf106fb4f450517..3fb07dae586c5511cb048b20264072bf6db54df8 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -212,7 +212,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -217,7 +217,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public void reportTimings() {
diff --git a/patches/server/0003-Leaves-Server-Utils.patch b/patches/server/0003-Leaves-Server-Utils.patch
index 32965453..4bd390db 100644
--- a/patches/server/0003-Leaves-Server-Utils.patch
+++ b/patches/server/0003-Leaves-Server-Utils.patch
@@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
public PlayerAreaMap() {
super();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2c06f3ebf7e1069727387bfc60db30c958c14b5a..12e8a6794669496c0fa554be3947fac56f773d5d 100644
+index 906eded9a2ab61737a30cfe89292a71237ce4eb7..75d5e255bb166d2ec7325b16e8e5a30b43855276 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -423,6 +423,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -42,7 +42,7 @@ index 2c06f3ebf7e1069727387bfc60db30c958c14b5a..12e8a6794669496c0fa554be3947fac5
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
-@@ -2476,6 +2477,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2480,6 +2481,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
nbttagcompound.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -50,7 +50,7 @@ index 2c06f3ebf7e1069727387bfc60db30c958c14b5a..12e8a6794669496c0fa554be3947fac5
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2623,6 +2625,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2627,6 +2629,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end
@@ -62,7 +62,7 @@ index 2c06f3ebf7e1069727387bfc60db30c958c14b5a..12e8a6794669496c0fa554be3947fac5
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4909,4 +4916,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4912,4 +4919,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end - Expose entity id counter
diff --git a/patches/server/0004-Update-version-fetcher-repo.patch b/patches/server/0004-Update-version-fetcher-repo.patch
index 241aa43d..4e561c45 100644
--- a/patches/server/0004-Update-version-fetcher-repo.patch
+++ b/patches/server/0004-Update-version-fetcher-repo.patch
@@ -36,10 +36,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..fa446ff1b7284b58ee88566cbbe39d81
if (data == null) {
return null;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 995ae8f2f76bf0255d7eac4190c5b961bfb17f24..ee26068689b9d35bb2c590dbd77fecd420dda28c 100644
+index 3fb07dae586c5511cb048b20264072bf6db54df8..008a3da71071128c6302d881ed51d1d837e17e6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -481,7 +481,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -496,7 +496,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
diff --git a/patches/server/0005-Leaves-Server-Config-And-Command.patch b/patches/server/0005-Leaves-Server-Config-And-Command.patch
index c8abbd81..e4fd8c27 100644
--- a/patches/server/0005-Leaves-Server-Config-And-Command.patch
+++ b/patches/server/0005-Leaves-Server-Config-And-Command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config And Command
diff --git a/build.gradle.kts b/build.gradle.kts
-index f5c83d033a8163786f8f7e98655e65bb606bc9dc..227da433d47d4982877737a08817f4840dc51a00 100644
+index 25408f536cef272f2457e29fe4bff98fa285f363..a9269245ad80d4071e9c09190fc20ce97809e4a1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -227,3 +227,12 @@ tasks.registerRunTask("runDev") {
+@@ -228,3 +228,12 @@ tasks.registerRunTask("runDev") {
classpath(runtimeClasspathForRunDev)
jvmArgs("-DPaper.isRunDev=true")
}
@@ -34,7 +34,7 @@ index 61e0e14b74c6585a9d157cae3db9c5c3a69b393f..2cf51683978e72d552f9148a61070420
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
Arrays.fill( this.recentTps, 20 );
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d562b9ce89e510584cf8efc25302a18f6dbf2f2d..1a610cd47fb26b70bc16078adc2c22acff6a9578 100644
+index d0cf730f175c707b50577b7080bd81cf045ed980..60e5129b42c430ba6b9776bf63d0db608552b50f 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -220,6 +220,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -48,10 +48,10 @@ index d562b9ce89e510584cf8efc25302a18f6dbf2f2d..1a610cd47fb26b70bc16078adc2c22ac
this.setPvpAllowed(dedicatedserverproperties.pvp);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a3b7d9ef5d9149e04eb69ebc30b59fba3f8f49f0..61f3bf48558eb469778fd33f50de9d5b016bf700 100644
+index b5af2a4608a5871916fe28fff3b040ad7528cfdf..1824057ea9b7cf22e4fbb2251154bc415568b3e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1069,6 +1069,7 @@ public final class CraftServer implements Server {
+@@ -1081,6 +1081,7 @@ public final class CraftServer implements Server {
playerMetadata.removeAll(plugin);
}
// Paper end
@@ -59,7 +59,7 @@ index a3b7d9ef5d9149e04eb69ebc30b59fba3f8f49f0..61f3bf48558eb469778fd33f50de9d5b
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
-@@ -3000,6 +3001,14 @@ public final class CraftServer implements Server {
+@@ -3012,6 +3013,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
diff --git a/patches/server/0006-Leaves-Protocol-Core.patch b/patches/server/0006-Leaves-Protocol-Core.patch
index f52b1435..3c610ef8 100644
--- a/patches/server/0006-Leaves-Protocol-Core.patch
+++ b/patches/server/0006-Leaves-Protocol-Core.patch
@@ -77,10 +77,10 @@ index 6104f952b9138b0030aebd23c23fdeccc88e567d..6d4f175e2820b48d04bd11fc694fcdfc
ServerLevel worldserver = entityplayer.serverLevel();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61f3bf48558eb469778fd33f50de9d5b016bf700..20414b4cb34b05acf98ea31e2d0e5a4cc7ad515a 100644
+index 1824057ea9b7cf22e4fbb2251154bc415568b3e0..389e8d1f8c218649b622d2e6f24b05a14a1a1d45 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -463,6 +463,7 @@ public final class CraftServer implements Server {
+@@ -465,6 +465,7 @@ public final class CraftServer implements Server {
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
}
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -88,7 +88,7 @@ index 61f3bf48558eb469778fd33f50de9d5b016bf700..20414b4cb34b05acf98ea31e2d0e5a4c
}
public boolean getCommandBlockOverride(String command) {
-@@ -1075,6 +1076,7 @@ public final class CraftServer implements Server {
+@@ -1087,6 +1088,7 @@ public final class CraftServer implements Server {
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/patches/server/0007-Fix-gravity-block-duper.patch b/patches/server/0007-Fix-gravity-block-duper.patch
index 4129a04e..0f739d5a 100644
--- a/patches/server/0007-Fix-gravity-block-duper.patch
+++ b/patches/server/0007-Fix-gravity-block-duper.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix gravity block duper
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 12e8a6794669496c0fa554be3947fac56f773d5d..6221f9a0d6db86ca3adcd72842dfce3c9d0b8a34 100644
+index 75d5e255bb166d2ec7325b16e8e5a30b43855276..1bd585630940b2678bd1d9c3c344c17deb461c03 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -440,6 +440,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -24,7 +24,7 @@ index 12e8a6794669496c0fa554be3947fac56f773d5d..6221f9a0d6db86ca3adcd72842dfce3c
// Paper start - optimise entity tracking
final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
-@@ -3179,7 +3181,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3183,7 +3185,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
this.processPortalCooldown();
@@ -34,7 +34,7 @@ index 12e8a6794669496c0fa554be3947fac56f773d5d..6221f9a0d6db86ca3adcd72842dfce3c
}
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 9daf8aa557d9f4fdbcc138a47892ea5a061dd877..09f227c8b5a62497e943fb06d21abe4556b0a888 100644
+index 05b77bf1af82397c542fde19b54ee545448ce12e..c753bc1a3369827d8ef4705e313f744f07759e40 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -132,11 +132,7 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch
index 1f1f0e5f..ca416fca 100644
--- a/patches/server/0010-Fakeplayer-support.patch
+++ b/patches/server/0010-Fakeplayer-support.patch
@@ -165,7 +165,7 @@ index 58591bf2f63b9c5e97d9ce4188dff3366968a178..f961fc365118a06b140cac780d5618ea
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ac6943913c887b14078aabb2581f7f16deb4b4a..1939c2f8c020c8ba6701a9d886b315276c1d1862 100644
+index e1fb72685134611a545bc2921f2bf3e0cc5415f5..2854f5e647e408405aeaf76ff940ae3ff8f628d4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -297,7 +297,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -268,10 +268,10 @@ index 6d4f175e2820b48d04bd11fc694fcdfc73580da9..eb4baddfe05397c52d7722d81dd3078b
+ // Leaves end - fakeplayer support
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb2e1468fdc7ba53cd907d3d7570921270ee2b67..51e7bce3813dec3c60677f8233d522c3d5d55cc5 100644
+index 1bd585630940b2678bd1d9c3c344c17deb461c03..5bec3993773db2b1e74d448a987480268e3ddb20 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1457,7 +1457,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1456,7 +1456,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return offsetFactor;
}
@@ -347,10 +347,10 @@ index ed80960777b18faca2d6a99783e53daf5fa19e09..9d492a2a45a2088f4bf28c85f04c22fa
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 20414b4cb34b05acf98ea31e2d0e5a4cc7ad515a..f935e286103618401726481b512794430bc26c8a 100644
+index 389e8d1f8c218649b622d2e6f24b05a14a1a1d45..412d8201906d3a0915a32837944e960b151a5605 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -259,6 +259,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
+@@ -261,6 +261,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -358,7 +358,7 @@ index 20414b4cb34b05acf98ea31e2d0e5a4cc7ad515a..f935e286103618401726481b51279443
import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
-@@ -305,6 +306,7 @@ public final class CraftServer implements Server {
+@@ -307,6 +308,7 @@ public final class CraftServer implements Server {
public static Exception excessiveVelEx; // Paper - Velocity warnings
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper - Custom Potion Mixes
@@ -366,7 +366,7 @@ index 20414b4cb34b05acf98ea31e2d0e5a4cc7ad515a..f935e286103618401726481b51279443
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
-@@ -3243,4 +3245,11 @@ public final class CraftServer implements Server {
+@@ -3255,4 +3257,11 @@ public final class CraftServer implements Server {
}
// Paper end
diff --git a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch
index aef99b7c..db729d87 100644
--- a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch
+++ b/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 179d96358f935a7717c6a7a4cd6e64b60d76bb34..f7c08415b99289d0cfb522121bbec1dbb3929119 100644
+index 371cd5423f0e8f84b5ddef8f1d98e4889b1b4361..3688e262988f012109930bf2d8c2d679e7283d7a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1613,12 +1613,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1614,12 +1614,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
@@ -23,7 +23,7 @@ index 179d96358f935a7717c6a7a4cd6e64b60d76bb34..f7c08415b99289d0cfb522121bbec1db
itemstack1.shrink(1);
}
if (itemstack != null && this instanceof ServerPlayer) {
-@@ -4544,3 +4544,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4557,3 +4557,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}
diff --git a/patches/server/0021-Optimize-suffocation.patch b/patches/server/0021-Optimize-suffocation.patch
index 449622a9..70f06609 100644
--- a/patches/server/0021-Optimize-suffocation.patch
+++ b/patches/server/0021-Optimize-suffocation.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize suffocation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f7c08415b99289d0cfb522121bbec1dbb3929119..d704db7227fee370d0df87a7efe24b0ede2b1de8 100644
+index 3688e262988f012109930bf2d8c2d679e7283d7a..172c6e718ff0ab22e63ecfa867e4462947119972 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -411,7 +411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -412,7 +412,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
boolean flag = this instanceof net.minecraft.world.entity.player.Player;
if (!this.level().isClientSide) {
@@ -18,7 +18,7 @@ index f7c08415b99289d0cfb522121bbec1dbb3929119..d704db7227fee370d0df87a7efe24b0e
this.hurt(this.damageSources().inWall(), 1.0F);
} else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
-@@ -1408,6 +1408,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1409,6 +1409,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.getHealth() <= 0.0F;
}
diff --git a/patches/server/0033-Cache-climbing-check-for-activation.patch b/patches/server/0033-Cache-climbing-check-for-activation.patch
index 8c729baf..f2fc7c81 100644
--- a/patches/server/0033-Cache-climbing-check-for-activation.patch
+++ b/patches/server/0033-Cache-climbing-check-for-activation.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Cache climbing check for activation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d704db7227fee370d0df87a7efe24b0ede2b1de8..dcba3baaf5ad7dae87a2698eb42ecb80b106c16f 100644
+index 172c6e718ff0ab22e63ecfa867e4462947119972..95fa28334cf745d8381f731ab5f56896eb377a9f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2011,6 +2011,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2024,6 +2024,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.lastClimbablePos;
}
diff --git a/patches/server/0035-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0035-Reduce-entity-fluid-lookups-if-no-fluids.patch
index 270bf362..abdf5421 100644
--- a/patches/server/0035-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0035-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8078a716cba6baa5723a5b2feda2b04e9a35887f..00983d59c699e6557eae0f4d3bd144e71147c9f7 100644
+index 7a00bf872a127dc2d1aef9668432fc7a23a3a696..02a8d57c6f774e468ffb05a4d389ac6610054665 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4411,16 +4411,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4414,16 +4414,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) {
@@ -35,7 +35,7 @@ index 8078a716cba6baa5723a5b2feda2b04e9a35887f..00983d59c699e6557eae0f4d3bd144e7
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
-@@ -4428,38 +4430,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4431,38 +4433,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
diff --git a/patches/server/0037-PCA-sync-protocol.patch b/patches/server/0037-PCA-sync-protocol.patch
index 98808511..9f7f5f4f 100644
--- a/patches/server/0037-PCA-sync-protocol.patch
+++ b/patches/server/0037-PCA-sync-protocol.patch
@@ -61,10 +61,10 @@ index 6d23c39e4eadf23616080d6d08672e13b5d3c37d..f86384ba4e5b5ffd26dd64e41a9af8a3
@Override
public boolean stillValid(Player player) {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index d04fc84eef11adb5ea64077f48794b6ed7fb3ada..29580b4f6841c5c3398f8b4b224d9383f006cfb1 100644
+index 89d06253b00604114e543ebbe12a9993ae95dc41..cb0cb894df65e6d4d65b369955a7d7d78fa7bc2b 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -570,6 +570,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+@@ -575,6 +575,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
}
@@ -164,7 +164,7 @@ index 56b328c64bea0ffd51930d8ba15fb87a36e6d8a1..e4430f96f055333c94ef1f910e198122
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index bc01481ac5990ad1cfd1def5a16dd0ed2f9de8c9..e7bfc1008d270de81b375e3dd6e3c3439565752e 100644
+index 9bb542ce3a8c52e1688bb1f66fc916dd23a5fd10..7356c6e03e4823a87a9918ef164b9438e0cec123 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
@@ -334,6 +334,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
diff --git a/patches/server/0048-Return-nether-portal-fix.patch b/patches/server/0048-Return-nether-portal-fix.patch
index 053feb3b..ac0f5e5e 100644
--- a/patches/server/0048-Return-nether-portal-fix.patch
+++ b/patches/server/0048-Return-nether-portal-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1e0964320b01603953882247895946ad52d70ead..b8ad556696b5ff0110f1c1e9accf242c436e4df3 100644
+index 96952b892c7f5a3cc2fa680021539469b2ecdb46..b4f5adba490ec33bbd83be61ae62ceaf8e9f7b17 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -187,6 +187,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -111,10 +111,10 @@ index aee640da4164195962b165f1d4ae385dbfd9d3d3..8a40b3d93bebddef417642a947ac73c8
// Save player file again if they were disconnected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dcba3baaf5ad7dae87a2698eb42ecb80b106c16f..ae32dfaa06295ae2bd046fa6303439810dec0ed8 100644
+index 95fa28334cf745d8381f731ab5f56896eb377a9f..b39c0db368b5de59503e434aa3e10f6233375fae 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -239,7 +239,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -240,7 +240,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
protected ItemStack useItem;
protected int useItemRemaining;
protected int fallFlyTicks;
diff --git a/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch b/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch
index e54194b3..231808b5 100644
--- a/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch
+++ b/patches/server/0057-Disable-distance-check-for-UseItemOnPacket.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2d0b3ae86a32cf28824a5fdbd3dbf332f571f1e9..853264a6160f933bc08003b5b2e5d4dad6207ed5 100644
+index 1ff216875a540452b0ce3e5c462a5738c35a3f98..8f2bb7df5c0925b2ef700aebfcbdc539a4dddfe1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1936,7 +1936,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1932,7 +1932,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;
diff --git a/patches/server/0064-Creative-fly-no-clip.patch b/patches/server/0064-Creative-fly-no-clip.patch
index efb96620..156b2f62 100644
--- a/patches/server/0064-Creative-fly-no-clip.patch
+++ b/patches/server/0064-Creative-fly-no-clip.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Creative fly no clip
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index df8d6f3eb675354ce0d180fc56886ce12788d6ae..5873518e5c506eabc4ef421c6253944681e200d6 100644
+index 5ca1f834f311a87323ced2578535e66efa14e47f..94c61e011b757ded6bc2029cc60d0f6891c8fc9e 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -236,8 +236,8 @@ public abstract class Player extends LivingEntity {
+@@ -237,8 +237,8 @@ public abstract class Player extends LivingEntity {
@Override
public void tick() {
@@ -19,7 +19,7 @@ index df8d6f3eb675354ce0d180fc56886ce12788d6ae..5873518e5c506eabc4ef421c62539446
this.setOnGround(false);
}
-@@ -416,7 +416,7 @@ public abstract class Player extends LivingEntity {
+@@ -417,7 +417,7 @@ public abstract class Player extends LivingEntity {
Pose entitypose1;
@@ -28,7 +28,7 @@ index df8d6f3eb675354ce0d180fc56886ce12788d6ae..5873518e5c506eabc4ef421c62539446
if (this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.CROUCHING)) {
entitypose1 = Pose.CROUCHING;
} else {
-@@ -576,7 +576,7 @@ public abstract class Player extends LivingEntity {
+@@ -577,7 +577,7 @@ public abstract class Player extends LivingEntity {
}
this.bob += (f - this.bob) * 0.4F;
@@ -37,7 +37,7 @@ index df8d6f3eb675354ce0d180fc56886ce12788d6ae..5873518e5c506eabc4ef421c62539446
AABB axisalignedbb;
if (this.isPassenger() && !this.getVehicle().isRemoved()) {
-@@ -2067,6 +2067,21 @@ public abstract class Player extends LivingEntity {
+@@ -2068,6 +2068,21 @@ public abstract class Player extends LivingEntity {
@Override
public abstract boolean isSpectator();
diff --git a/patches/server/0069-Elytra-aeronautics-no-chunk-load.patch b/patches/server/0069-Elytra-aeronautics-no-chunk-load.patch
index 6cc0beb7..2205ea7a 100644
--- a/patches/server/0069-Elytra-aeronautics-no-chunk-load.patch
+++ b/patches/server/0069-Elytra-aeronautics-no-chunk-load.patch
@@ -45,7 +45,7 @@ index c32002aca09ec20aadfe71c2626672e75255a31a..b460bef510213f10a913c162d9a16714
SectionPos sectionposition = player.getLastSectionPos();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7101ca0ec164784d4be7a7c818131d4d11c69e98..6fb9627e5eb5873b4bc085ee4c6bc7052acad2e0 100644
+index 8f2bb7df5c0925b2ef700aebfcbdc539a4dddfe1..08d66f20294b7f4ef0f3f6c5ef799348ea3d9ce5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -545,7 +545,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -58,10 +58,10 @@ index 7101ca0ec164784d4be7a7c818131d4d11c69e98..6fb9627e5eb5873b4bc085ee4c6bc705
!worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
)) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3c12f375e42d9f72470b73fc84b5d86a21f26a99..f7aa3c7b38847d0d1be4417d99ed2edc3e4c0e6d 100644
+index 1a606bbcb1c3f2f72fcc2c7ad1a6d50ec8a26efb..875b4cf7243681062b6f4081f6b6e9db07e8c1a3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1103,7 +1103,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1102,7 +1102,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return;
}
}
@@ -76,7 +76,7 @@ index 3c12f375e42d9f72470b73fc84b5d86a21f26a99..f7aa3c7b38847d0d1be4417d99ed2edc
this.level().getProfiler().push("move");
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
-@@ -2038,6 +2044,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2037,6 +2043,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.yo = y;
this.zo = d4;
this.setPos(d3, y, d4);
@@ -85,10 +85,10 @@ index 3c12f375e42d9f72470b73fc84b5d86a21f26a99..f7aa3c7b38847d0d1be4417d99ed2edc
}
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5873518e5c506eabc4ef421c6253944681e200d6..7db2a60403e45f5f8e447442b534242df7095c73 100644
+index 94c61e011b757ded6bc2029cc60d0f6891c8fc9e..c53c9e62763bde9d291c469c71a0a4db55e3a793 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -181,6 +181,8 @@ public abstract class Player extends LivingEntity {
+@@ -182,6 +182,8 @@ public abstract class Player extends LivingEntity {
public float hurtDir; // Paper - protected -> public
public boolean affectsSpawning = true; // Paper - Affects Spawning API
public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
diff --git a/patches/server/0072-No-block-update-command.patch b/patches/server/0072-No-block-update-command.patch
index 5cdf78d4..f3c05ef4 100644
--- a/patches/server/0072-No-block-update-command.patch
+++ b/patches/server/0072-No-block-update-command.patch
@@ -17,10 +17,10 @@ index 2211887522f4ee9e069e8d42d797906343864f75..678410cd734cd7e3e3b999b7908f2e3f
// CraftBukkit start
if (this.populating) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index ed27a963223bfe18310ad5adabf461b5e307ef9c..80e9b0615fc8036897b2dc8b0aefc4ef4a0f16f7 100644
+index 1ad126d992d95062a3db08374db7a927f23a0cac..418a7c9217e6e06bff6866deffff3e7822d35a14 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -482,7 +482,7 @@ public final class ItemStack {
+@@ -483,7 +483,7 @@ public final class ItemStack {
net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
diff --git a/patches/server/0077-SIMD-support.patch b/patches/server/0077-SIMD-support.patch
index 09ec104c..c0d1c8d4 100644
--- a/patches/server/0077-SIMD-support.patch
+++ b/patches/server/0077-SIMD-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] SIMD support
diff --git a/build.gradle.kts b/build.gradle.kts
-index f5c83d033a8163786f8f7e98655e65bb606bc9dc..ca79034c1f044a9096de65b0936971c4fd68eb32 100644
+index a9269245ad80d4071e9c09190fc20ce97809e4a1..9a0b18e534a2fde5ecd7477838e26ed1f0141631 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -68,6 +68,7 @@ tasks.withType {
+@@ -69,6 +69,7 @@ tasks.withType {
compilerArgs.add("-Xlint:-module")
compilerArgs.add("-Xlint:-removal")
compilerArgs.add("-Xlint:-dep-ann")
@@ -16,7 +16,7 @@ index f5c83d033a8163786f8f7e98655e65bb606bc9dc..ca79034c1f044a9096de65b0936971c4
}
// Leaves end - hide irrelevant compilation warnings
-@@ -192,6 +193,8 @@ fun TaskContainer.registerRunTask(
+@@ -193,6 +194,8 @@ fun TaskContainer.registerRunTask(
minHeapSize = "${memoryGb}G"
maxHeapSize = "${memoryGb}G"
diff --git a/patches/server/0088-Reduce-array-allocations.patch b/patches/server/0088-Reduce-array-allocations.patch
index f1942f11..a5d9b41b 100644
--- a/patches/server/0088-Reduce-array-allocations.patch
+++ b/patches/server/0088-Reduce-array-allocations.patch
@@ -257,7 +257,7 @@ index 678410cd734cd7e3e3b999b7908f2e3f25f23a13..1240121d732a9697ec6bffcc459a00c7
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index abb5d1a780e9c3a16700dba91aca73cba0e94b68..36411cc6c1d375cc7584daa8aa6ebb8caba7ad8a 100644
+index 08d66f20294b7f4ef0f3f6c5ef799348ea3d9ce5..0e6cec7fd2ed5b8a647678a0d5ab783e3fe10d43 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -242,6 +242,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -371,10 +371,10 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408
private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
this.type = type;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ae32dfaa06295ae2bd046fa6303439810dec0ed8..1798cf02f4805fc69da5eab7041b517b59c50788 100644
+index b39c0db368b5de59503e434aa3e10f6233375fae..0a5d43fa861aed808593e22aaa045bc35543deb9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3145,7 +3145,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3158,7 +3158,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Nullable
private Map collectEquipmentChanges() {
Map map = null;
@@ -384,7 +384,7 @@ index ae32dfaa06295ae2bd046fa6303439810dec0ed8..1798cf02f4805fc69da5eab7041b517b
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 3c013188cbd667ae23e971869150eab7234d9090..938b7941f152f2b0970bfe8938af9e3db8abc70d 100644
+index 35e2cf1b4f5e7f15ff7821b09ed42a1cc69bb3ac..ab781eeb24f832a13b1cedf73ca6391daaf58248 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1088,7 +1088,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -437,10 +437,10 @@ index 7de9d012e7416eaa0189b513a0972c846e93c4b6..505cae0013a501cbff094a83c491af96
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 80e9b0615fc8036897b2dc8b0aefc4ef4a0f16f7..2dee534271a6bda96a9eb094a07c9fc33f549c0f 100644
+index 418a7c9217e6e06bff6866deffff3e7822d35a14..506ef97bbc82ed901998460207199b1b3c88ca40 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1052,7 +1052,7 @@ public final class ItemStack {
+@@ -1053,7 +1053,7 @@ public final class ItemStack {
int k;
if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {
@@ -539,7 +539,7 @@ index f9084e2605d7403721fe6b714bfad051f932aaef..07d9620768150444b3cc1e288ab8ad07
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 29580b4f6841c5c3398f8b4b224d9383f006cfb1..d1c102b9e12033c6ba6cd66706e891c4aa7c0009 100644
+index cb0cb894df65e6d4d65b369955a7d7d78fa7bc2b..178c897630e208b4d86615e8f6759ca35e49dae6 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -59,6 +59,7 @@ import org.bukkit.event.inventory.FurnaceSmeltEvent;
diff --git a/patches/server/0089-Optimize-sun-burn-tick.patch b/patches/server/0089-Optimize-sun-burn-tick.patch
index e24bbdf2..2b427d9e 100644
--- a/patches/server/0089-Optimize-sun-burn-tick.patch
+++ b/patches/server/0089-Optimize-sun-burn-tick.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize sun burn tick
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f7aa3c7b38847d0d1be4417d99ed2edc3e4c0e6d..42aa275f86101cb697f2525542be5d16815f6863 100644
+index 875b4cf7243681062b6f4081f6b6e9db07e8c1a3..ebf632acc90a6f8a23208da49152fc1fdd5a0e69 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2024,8 +2024,22 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2023,8 +2023,22 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
/** @deprecated */
@Deprecated
public float getLightLevelDependentMagicValue() {
@@ -34,7 +34,7 @@ index f7aa3c7b38847d0d1be4417d99ed2edc3e4c0e6d..42aa275f86101cb697f2525542be5d16
public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
this.absMoveTo(x, y, z);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 938b7941f152f2b0970bfe8938af9e3db8abc70d..a298ede6033d13986acbe88614a0ec1ba42a3958 100644
+index ab781eeb24f832a13b1cedf73ca6391daaf58248..968f0baa02e32653d2fdcfaa07fca1ade195b0ee 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1723,15 +1723,41 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/0091-Use-optimized-collection.patch b/patches/server/0091-Use-optimized-collection.patch
index a1fe1d85..e0ac5342 100644
--- a/patches/server/0091-Use-optimized-collection.patch
+++ b/patches/server/0091-Use-optimized-collection.patch
@@ -71,10 +71,10 @@ index 676f5485a4ca9252e911213dcda8d51776b637b6..a7d6545876f2209f3ce9a07d3eff1936
private final EnumSet disabledFlags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index c246981987017a2f86c5d632929356855e2b5714..b3005972ea8c21198d8ea19f1f90d2a41dce3b8b 100644
+index 4a340bd1f1859e43bb58e68aee4018fdb4ca7a5a..79be9ba9d94b7fb88a7afab4e193ef9747aaae88 100644
--- a/src/main/java/net/minecraft/world/level/GameRules.java
+++ b/src/main/java/net/minecraft/world/level/GameRules.java
-@@ -141,7 +141,7 @@ public class GameRules {
+@@ -142,7 +142,7 @@ public class GameRules {
}
private GameRules(Map, GameRules.Value> rules) {
diff --git a/patches/server/0094-Check-frozen-ticks-before-landing-block.patch b/patches/server/0094-Check-frozen-ticks-before-landing-block.patch
index aa1e1494..1bc9676a 100644
--- a/patches/server/0094-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0094-Check-frozen-ticks-before-landing-block.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Check frozen ticks before landing block
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1798cf02f4805fc69da5eab7041b517b59c50788..a95b73f5e0d2a0bde8771c9239992fe1d0c33e09 100644
+index 0a5d43fa861aed808593e22aaa045bc35543deb9..453887abfc7a6ea5df45a4fb90971c7c316f56f3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -580,11 +580,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -581,11 +581,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected void tryAddFrost() {
diff --git a/patches/server/0096-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0096-Skip-entity-move-if-movement-is-zero.patch
index ff1a1437..6f461bf8 100644
--- a/patches/server/0096-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0096-Skip-entity-move-if-movement-is-zero.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 42aa275f86101cb697f2525542be5d16815f6863..268326d78b03aad9b0efa14eb009881c9397a2f6 100644
+index ebf632acc90a6f8a23208da49152fc1fdd5a0e69..e0a09e000bc4a9159f7eb170a754322a0db51da2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -316,6 +316,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -17,7 +17,7 @@ index 42aa275f86101cb697f2525542be5d16815f6863..268326d78b03aad9b0efa14eb009881c
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
-@@ -1080,6 +1081,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1079,6 +1080,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {
@@ -31,7 +31,7 @@ index 42aa275f86101cb697f2525542be5d16815f6863..268326d78b03aad9b0efa14eb009881c
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -4108,6 +4116,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4111,6 +4119,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
public final void setBoundingBox(AABB boundingBox) {
diff --git a/patches/server/0098-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0098-Skip-negligible-planar-movement-multiplication.patch
index f509a996..6ebf7fc6 100644
--- a/patches/server/0098-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0098-Skip-negligible-planar-movement-multiplication.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Skip negligible planar movement multiplication
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 268326d78b03aad9b0efa14eb009881c9397a2f6..318edf18fc2c339ac881a1e5a957154eeb330255 100644
+index e0a09e000bc4a9159f7eb170a754322a0db51da2..12db5e0dad3ba271ee6335074c6bf2b0d8801599 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1252,9 +1252,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1251,9 +1251,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
this.tryCheckInsideBlocks();
diff --git a/patches/server/0104-Force-peaceful-mode-switch.patch b/patches/server/0104-Force-peaceful-mode-switch.patch
index 64e9efea..1b34b61c 100644
--- a/patches/server/0104-Force-peaceful-mode-switch.patch
+++ b/patches/server/0104-Force-peaceful-mode-switch.patch
@@ -107,10 +107,10 @@ index 3e10668ca548472238bb4bb0a80a89f169a71496..aaea6e5701e23c5023bb990712bde7af
boolean spawnThisTick = true;
int limit = enumcreaturetype.getMaxInstancesPerChunk();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a139601888b88e8580bdb9c2469386a94abae975..948a4595d2c3fe91295bef0001d99521403f7a26 100644
+index bfb178c69026e9759e9afaebb9da141b62d1f144..171162e99da711f6887adcc6c2bad32035488318 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2385,6 +2385,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2422,6 +2422,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return CraftFeatureFlag.getFromNMS(this.getHandle().enabledFeatures()).stream().map(FeatureFlag.class::cast).collect(Collectors.toUnmodifiableSet());
}
diff --git a/patches/server/0106-Replay-Mod-API.patch b/patches/server/0106-Replay-Mod-API.patch
index 292c533f..61fa7a00 100644
--- a/patches/server/0106-Replay-Mod-API.patch
+++ b/patches/server/0106-Replay-Mod-API.patch
@@ -133,7 +133,7 @@ index 2e2a7c2cf3081187da817479a9da3eb10f662a6d..ee616fe98c98a345872c1eadf41c7852
}).map((player) -> {
return player.getGameProfile().getName();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 36411cc6c1d375cc7584daa8aa6ebb8caba7ad8a..2030ae4806070b2ea1dc50a0f5286d1e0010dcd1 100644
+index 0e6cec7fd2ed5b8a647678a0d5ab783e3fe10d43..3e212eb7a16309511f644170055c282e3d15f9b5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -299,7 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -369,10 +369,10 @@ index 3bec06ed4b47af1b40ba4fef264ef7b3d643fbf1..fdb4f4f8079ed680fc8deb068a5e2f0c
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f0c48a4a0 100644
+index 412d8201906d3a0915a32837944e960b151a5605..2e9c8ce754fa68121e2acbc4cd6ba828b39b7558 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -260,6 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -262,6 +262,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
import top.leavesmc.leaves.entity.CraftBotManager;
@@ -380,7 +380,7 @@ index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f
import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
-@@ -307,6 +308,7 @@ public final class CraftServer implements Server {
+@@ -309,6 +310,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper - Custom Potion Mixes
private final CraftBotManager botManager = new CraftBotManager();
@@ -388,7 +388,7 @@ index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
-@@ -388,7 +390,7 @@ public final class CraftServer implements Server {
+@@ -390,7 +392,7 @@ public final class CraftServer implements Server {
public CraftServer(DedicatedServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
@@ -397,7 +397,7 @@ index f935e286103618401726481b512794430bc26c8a..fc7f5ecebcc15834d7d1348f8882fd2f
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
-@@ -3252,4 +3254,11 @@ public final class CraftServer implements Server {
+@@ -3264,4 +3266,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API
@@ -431,10 +431,10 @@ index dc7ba0ce76031e6dd7e550ceaf3b2f97cbc307f1..ca4a3830e2c57107921be7eef6f15f36
// Special case complex part, since there is no extra entity type for them
if (entity instanceof EnderDragonPart complexPart) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 39b25c2478eadd373383a3445a7f27ea30d18550..0a1190e7331de715a2568ad7911fdb180c0f13ed 100644
+index 206520f6f20b2e48b1eefdd4edb26510b88e4c92..e5ffd43289e67fa2bfd30bf8b8e2e88272b7a0e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2106,7 +2106,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2136,7 +2136,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean canSee(Player player) {
diff --git a/patches/server/0119-Disable-moved-wrongly-threshold.patch b/patches/server/0119-Disable-moved-wrongly-threshold.patch
index cfade8a9..536c457e 100644
--- a/patches/server/0119-Disable-moved-wrongly-threshold.patch
+++ b/patches/server/0119-Disable-moved-wrongly-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable moved wrongly threshold
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2030ae4806070b2ea1dc50a0f5286d1e0010dcd1..c05545d84d0bbd98afcc020edc5f12101e454479 100644
+index 3e212eb7a16309511f644170055c282e3d15f9b5..1209732aaa9cd8d08a188985b1385eb6c306313e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -555,7 +555,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -26,7 +26,7 @@ index 2030ae4806070b2ea1dc50a0f5286d1e0010dcd1..c05545d84d0bbd98afcc020edc5f1210
flag2 = true; // Paper - diff on change, this should be moved wrongly
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
}
-@@ -1441,7 +1441,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1437,7 +1437,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
toX, toY, toZ, toYaw, toPitch, true);
if (!event.isAllowed()) {
@@ -35,7 +35,7 @@ index 2030ae4806070b2ea1dc50a0f5286d1e0010dcd1..c05545d84d0bbd98afcc020edc5f1210
ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8});
this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
return;
-@@ -1511,7 +1511,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -1507,7 +1507,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
d10 = d6 * d6 + d7 * d7 + d8 * d8;
boolean movedWrongly = false; // Paper - Add fail move event; rename
diff --git a/patches/server/0124-Linear-region-file-format.patch b/patches/server/0124-Linear-region-file-format.patch
index 083123ab..6605b199 100644
--- a/patches/server/0124-Linear-region-file-format.patch
+++ b/patches/server/0124-Linear-region-file-format.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Linear region file format
This patch is Powered by LinearPurpur(https://github.com/StupidCraft/LinearPurpur)
diff --git a/build.gradle.kts b/build.gradle.kts
-index ca79034c1f044a9096de65b0936971c4fd68eb32..990dc1fdd1bffa6bc96f7b325d3e12d55f58e27b 100644
+index 9a0b18e534a2fde5ecd7477838e26ed1f0141631..bda3880bbd1406d88a6d32f89f302d9eb2eea988 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,6 +36,10 @@ dependencies {
@@ -505,10 +505,10 @@ index fe312b1aef579cb4bf81bdd967cf72ff880d7505..756c69066ad5336c8faffd22dd48f2ec
regionfile.flush();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 948a4595d2c3fe91295bef0001d99521403f7a26..ea375449c93d802c63ea697cefb0a39cba79d001 100644
+index 171162e99da711f6887adcc6c2bad32035488318..ebbf27a1d4ec91b6c9ffa0f60e187cb8a17037a7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -567,7 +567,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -573,7 +573,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
world.getChunk(x, z); // make sure we're at ticket level 32 or lower
return true;
}
diff --git a/patches/server/0134-Fix-falling-block-s-block-location.patch b/patches/server/0134-Fix-falling-block-s-block-location.patch
index 3d4c5272..1053fa87 100644
--- a/patches/server/0134-Fix-falling-block-s-block-location.patch
+++ b/patches/server/0134-Fix-falling-block-s-block-location.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix falling block's block location
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 318edf18fc2c339ac881a1e5a957154eeb330255..96b02f15e55ee9176a0301fa1b7d6cd4d10f1961 100644
+index 12db5e0dad3ba271ee6335074c6bf2b0d8801599..754c6a787a1b61b35f544e2259e4df668c0a72da 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4791,6 +4791,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4794,6 +4794,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
int j = Mth.floor(y);
int k = Mth.floor(z);