From e261a92f4e376cb246cb6e9f1c1c5ea25ac37c1d Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:54:16 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/api/0001-Leaves-Server-Config.patch | 4 ++-- patches/server/0001-Build-changes.patch | 16 ++++++------- patches/server/0002-Leaves-Server-Utils.patch | 4 ++-- ...004-Leaves-Server-Config-And-Command.patch | 12 +++++----- .../server/0005-Fix-gravity-block-duper.patch | 10 ++++---- ...Add-isShrink-to-EntityResurrectEvent.patch | 6 ++--- .../server/0022-Optimize-suffocation.patch | 6 ++--- ...cing-for-EntityLiving-hasLineOfSight.patch | 4 ++-- ...check-for-spooky-season-once-an-hour.patch | 4 ++-- ...-Cache-climbing-check-for-activation.patch | 4 ++-- ...ce-entity-fluid-lookups-if-no-fluids.patch | 6 ++--- .../0041-Reduce-chunk-loading-lookups.patch | 4 ++-- patches/server/0043-PCA-sync-protocol.patch | 12 +++++----- patches/server/0044-BBOR-Protocol.patch | 6 ++--- patches/server/0047-Jade-Protocol.patch | 8 +++---- .../server/0051-Stackable-ShulkerBoxes.patch | 24 +++++++++---------- .../0053-MC-Technical-Survival-Mode.patch | 8 +++---- .../0054-Return-nether-portal-fix.patch | 6 ++--- patches/server/0055-Appleskin-Protocol.patch | 4 ++-- .../0058-Use-vanilla-random-config.patch | 10 ++++---- .../0069-Despawn-enderman-with-block.patch | 4 ++-- 22 files changed, 82 insertions(+), 82 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3704d76..ae31d43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 packageVersion=1_20_R1 org.gradle.jvmargs=-Xmx2G -paperRef=f2c1e1366ad4139614eafe677daf35aa873718f0 +paperRef=12c970097d5044bf4124169745ad63efffc4a4ad preVersion=false diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch index 71afda5..58a5abc 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 5b225bbb128893d67251a96ab318035802a0cf76..d08e1fd95d9a3588bc54a078cfa93508ab1c86f9 100644 +index 6b72eccdcb6f75534a4267a1dd0a4cc2f39e917b..3c4915b8dd1b6e802a5942658b15d3a9db472364 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2006,6 +2006,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2029,6 +2029,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi throw new UnsupportedOperationException("Not supported yet."); } // Paper end diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 680ad39..43c8b6f 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b688eeae8034128318925ad83d308332dfe043d0 100644 +index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..bb4447f7648dc4bb33c5e0e3687435e3c470fa9c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -7,8 +7,12 @@ plugins { - } +@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { + val alsoShade: Configuration by configurations.creating dependencies { - implementation(project(":paper-api")) @@ -23,7 +23,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b688eeae8034128318925ad83d308332 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -58,13 +62,13 @@ tasks.jar { +@@ -66,13 +70,13 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() @@ -39,7 +39,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..b688eeae8034128318925ad83d308332 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -136,7 +140,7 @@ fun TaskContainer.registerRunTask( +@@ -149,7 +153,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -92,10 +92,10 @@ index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..670f25370554c3f8c40d2fcc4f5a31d7 public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..b1f34ee7a421c35eb3ee7ab112defe48d935c788 100644 +index a05c1bc8874ef5e380544a6a344c848e37da49c4..22402d237f036be3dcbaea3a63718e615766981c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper +@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { @@ -105,7 +105,7 @@ index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..b1f34ee7a421c35eb3ee7ab112defe48 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d4f6935a1bea77e5118bfd538f9b1358c21591a7..a53514f2c510b29f596c361de7bc0b405c27e964 100644 +index daed278d1bcf84ee42749f24e311b22b70015d79..35d2da9d91dcdd89de7c0f4af028fd182376ea8d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -292,7 +292,7 @@ public class Main { diff --git a/patches/server/0002-Leaves-Server-Utils.patch b/patches/server/0002-Leaves-Server-Utils.patch index f7bcd28..2796aa3 100644 --- a/patches/server/0002-Leaves-Server-Utils.patch +++ b/patches/server/0002-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 6abaf7ef99800a238b29dbbb85de8c970c0806a7..f3ef56b6c21b0bd1945716b50f14de106bcb525c 100644 +index 3ffb92a82e17af467afb18c81accc482a93d6a6f..33f657e1a5d7676db00c37f6c8a12abdb9b2374f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -62,7 +62,7 @@ index 6abaf7ef99800a238b29dbbb85de8c970c0806a7..f3ef56b6c21b0bd1945716b50f14de10 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT"); -@@ -4806,4 +4813,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4789,4 +4796,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end diff --git a/patches/server/0004-Leaves-Server-Config-And-Command.patch b/patches/server/0004-Leaves-Server-Config-And-Command.patch index f3bfff3..73ed650 100644 --- a/patches/server/0004-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0004-Leaves-Server-Config-And-Command.patch @@ -65,10 +65,10 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..4f0a2c9b352f5824ec0c30d0f0af0fe1 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b1f34ee7a421c35eb3ee7ab112defe48d935c788..7623ebe3bfc508183f67b84e1f1815697ed98ba8 100644 +index 22402d237f036be3dcbaea3a63718e615766981c..a394fcb1afe37efda30893e06352941f1a049319 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1053,6 +1053,7 @@ public final class CraftServer implements Server { +@@ -1056,6 +1056,7 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); @@ -76,7 +76,7 @@ index b1f34ee7a421c35eb3ee7ab112defe48d935c788..7623ebe3bfc508183f67b84e1f181569 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1068,6 +1069,7 @@ public final class CraftServer implements Server { +@@ -1071,6 +1072,7 @@ public final class CraftServer implements Server { } } world.spigotConfig.init(); // Spigot @@ -84,7 +84,7 @@ index b1f34ee7a421c35eb3ee7ab112defe48d935c788..7623ebe3bfc508183f67b84e1f181569 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1083,6 +1085,7 @@ public final class CraftServer implements Server { +@@ -1086,6 +1088,7 @@ public final class CraftServer implements Server { this.reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper @@ -92,7 +92,7 @@ index b1f34ee7a421c35eb3ee7ab112defe48d935c788..7623ebe3bfc508183f67b84e1f181569 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2849,6 +2852,14 @@ public final class CraftServer implements Server { +@@ -2863,6 +2866,14 @@ public final class CraftServer implements Server { { return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -108,7 +108,7 @@ index b1f34ee7a421c35eb3ee7ab112defe48d935c788..7623ebe3bfc508183f67b84e1f181569 @Override public void restart() { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index a53514f2c510b29f596c361de7bc0b405c27e964..269c7ba0707db4fdc45a70000e0be892b6dfa31d 100644 +index 35d2da9d91dcdd89de7c0f4af028fd182376ea8d..d73482fb1e71fe2951e96ae0593de268d533e5f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -165,6 +165,14 @@ public class Main { diff --git a/patches/server/0005-Fix-gravity-block-duper.patch b/patches/server/0005-Fix-gravity-block-duper.patch index d6e90b2..918f950 100644 --- a/patches/server/0005-Fix-gravity-block-duper.patch +++ b/patches/server/0005-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 ca82b601e99a64038e71b051510f6d1cc57b2f8f..8a30a18a24986f0c54483f69410e5dace4e4ca38 100644 +index 33f657e1a5d7676db00c37f6c8a12abdb9b2374f..b93be8c7da98c4b56d1a6fd74c32509c8d59f853 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -531,36 +531,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -46,7 +46,7 @@ index ca82b601e99a64038e71b051510f6d1cc57b2f8f..8a30a18a24986f0c54483f69410e5dac public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -3086,7 +3058,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3069,7 +3041,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.processPortalCooldown(); @@ -56,10 +56,10 @@ index ca82b601e99a64038e71b051510f6d1cc57b2f8f..8a30a18a24986f0c54483f69410e5dac } 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 eff81e846f696349b3bd3d26c02442f157b169f0..652070db14065a66b46ffcebbb2c0c2ad2db6f2a 100644 +index 18eaccb39a4c81338a8cbebe3de03934913ac2a4..34c62ba8d659c3df37243c3abf4cdd705b3ddf8c 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -@@ -130,11 +130,7 @@ public class FallingBlockEntity extends Entity { +@@ -132,11 +132,7 @@ public class FallingBlockEntity extends Entity { @Override public void tick() { @@ -72,7 +72,7 @@ index eff81e846f696349b3bd3d26c02442f157b169f0..652070db14065a66b46ffcebbb2c0c2a if (this.blockState.isAir()) { this.discard(); } else { -@@ -147,11 +143,7 @@ public class FallingBlockEntity extends Entity { +@@ -149,11 +145,7 @@ public class FallingBlockEntity extends Entity { this.move(MoverType.SELF, this.getDeltaMovement()); diff --git a/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch index 018ccab..45b5114 100644 --- a/patches/server/0011-Add-isShrink-to-EntityResurrectEvent.patch +++ b/patches/server/0011-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 064bd3f2615009b3f15f3a5006f0b5f7a7ba6bf5..a8c0b64f86a64b33d3b262c2b3e8b2bc61a4e3dd 100644 +index e11d7283662834047b2ff81a2fd25a4263792deb..d7861680dc319c22fa257e91b4ddc0caee20ef23 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1587,12 +1587,12 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1577,12 +1577,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 064bd3f2615009b3f15f3a5006f0b5f7a7ba6bf5..a8c0b64f86a64b33d3b262c2b3e8b2bc itemstack1.shrink(1); } if (itemstack != null && this instanceof ServerPlayer) { -@@ -4461,3 +4461,4 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -4451,3 +4451,4 @@ public abstract class LivingEntity extends Entity implements Attackable { } } diff --git a/patches/server/0022-Optimize-suffocation.patch b/patches/server/0022-Optimize-suffocation.patch index 13129e8..b1d34f7 100644 --- a/patches/server/0022-Optimize-suffocation.patch +++ b/patches/server/0022-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 67bf9ff852e190d89c877b86d9bfee07d6282430..903299fd5357b9955538aa20ec790672867bf394 100644 +index d7861680dc319c22fa257e91b4ddc0caee20ef23..e443253ee52892cc234bda9d930dda445d03b051 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -415,7 +415,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -414,7 +414,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 67bf9ff852e190d89c877b86d9bfee07d6282430..903299fd5357b9955538aa20ec790672 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(); -@@ -1370,6 +1370,15 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1369,6 +1369,15 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.getHealth() <= 0.0F; } diff --git a/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch index b26a552..5be8935 100644 --- a/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch +++ b/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight 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 f3a45bcc878e08318304dcbd1be1e19332d8dac7..f503ca69070091a5f5787bdffb5c6cd3a5777b4b 100644 +index e443253ee52892cc234bda9d930dda445d03b051..ef324b40917b3abf3b3d25dda3c8c258bdbc443e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3670,7 +3670,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3660,7 +3660,13 @@ public abstract class LivingEntity extends Entity implements Attackable { Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists diff --git a/patches/server/0024-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0024-Only-check-for-spooky-season-once-an-hour.patch index 0d3afa3..774d2bd 100644 --- a/patches/server/0024-Only-check-for-spooky-season-once-an-hour.patch +++ b/patches/server/0024-Only-check-for-spooky-season-once-an-hour.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Only check for spooky season once an hour This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 940cd932e74bc2e6754186731d7aa6f10d56eb68..bbab018a5fb58a56a8083f570d621bba11f9ca9a 100644 +index 5beaa849a250ea005733250ad3edfa8382224667..f124d17106edc490e90376bbbaba6912f0579d16 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -@@ -251,13 +251,30 @@ public class Bat extends AmbientCreature { +@@ -237,13 +237,30 @@ public class Bat extends AmbientCreature { } } diff --git a/patches/server/0038-Cache-climbing-check-for-activation.patch b/patches/server/0038-Cache-climbing-check-for-activation.patch index ef677d0..de5e3eb 100644 --- a/patches/server/0038-Cache-climbing-check-for-activation.patch +++ b/patches/server/0038-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 f503ca69070091a5f5787bdffb5c6cd3a5777b4b..45d98f2cdde569ebe863a8f74c7f9e145c7763f8 100644 +index ef324b40917b3abf3b3d25dda3c8c258bdbc443e..dfce80a9e4736f8545d20713ebd4d4d0fd377a10 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1984,6 +1984,22 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1974,6 +1974,22 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.lastClimbablePos; } diff --git a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch index d7b733f..0e30cc8 100644 --- a/patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0040-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 93fd2397d977b30b56820fff71c01ac1d54d129d..6addc14f1c6366da14662c445bc90d3017e7ac72 100644 +index a26ec93b1914492606499f3ecbbac3a1836295d4..afecf33c1df964decad84636c4e588369ad5ea8a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4312,16 +4312,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4295,16 +4295,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) { @@ -35,7 +35,7 @@ index 93fd2397d977b30b56820fff71c01ac1d54d129d..6addc14f1c6366da14662c445bc90d30 double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4329,38 +4331,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4312,38 +4314,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); diff --git a/patches/server/0041-Reduce-chunk-loading-lookups.patch b/patches/server/0041-Reduce-chunk-loading-lookups.patch index 0c697b5..3e805bd 100644 --- a/patches/server/0041-Reduce-chunk-loading-lookups.patch +++ b/patches/server/0041-Reduce-chunk-loading-lookups.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Reduce chunk loading & lookups This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 4616addb05fcc20b1ec6ca1dea01cbefed697acd..2fce5952352ca09335d3ba74e6d779c447b1a734 100644 +index 39eb9301626b191958ce42daa34b1ff3241cea80..7e19c96e92f821836702969aef4628f29155e519 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -322,11 +322,28 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -326,11 +326,28 @@ public class EnderMan extends Monster implements NeutralMob { private boolean teleport(double x, double y, double z) { BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(x, y, z); diff --git a/patches/server/0043-PCA-sync-protocol.patch b/patches/server/0043-PCA-sync-protocol.patch index 363c7f3..ad83671 100644 --- a/patches/server/0043-PCA-sync-protocol.patch +++ b/patches/server/0043-PCA-sync-protocol.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2aeda591a182896f50edff099b042357f1347a39..adae87a679f8bd6d42d472b56cdc0a7806bc9910 100644 +index d698758400fb0a8edc057a215c080978c3ba2211..527f3ff0ff48582fad63fdde7612d250913c10ef 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -245,6 +245,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -47,10 +47,10 @@ index 3088709b9dc3f46ec34f3ad16a43883feb89af16..160b58c31ab420ebd7bdc57b87e4dbb1 final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage(); diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java -index 79b6e241f425622fdc575b77d8dce7061c0ab783..57579e83cb2ba6ad82509e9e7b8fdda96b3553ce 100644 +index 9b35a50eb99551f28d45fd5114e0401b4c54646e..21aa401966c13677826697f3e4ee9b4cf1b9d963 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java -@@ -376,6 +376,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener, +@@ -379,6 +379,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener, @Override public void containerChanged(Container sender) { @@ -343,10 +343,10 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98 public int[] getSlotsForFace(Direction side) { return ShulkerBoxBlockEntity.SLOTS; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7623ebe3bfc508183f67b84e1f1815697ed98ba8..c7f113730842f643b5c764d32e8c30d6df73648d 100644 +index a394fcb1afe37efda30893e06352941f1a049319..31c7ec216108388954694c1ca0ae26d23c0c4c3c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -462,6 +462,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 @@ -354,7 +354,7 @@ index 7623ebe3bfc508183f67b84e1f1815697ed98ba8..c7f113730842f643b5c764d32e8c30d6 } public boolean getCommandBlockOverride(String command) { -@@ -1054,6 +1055,13 @@ public final class CraftServer implements Server { +@@ -1057,6 +1058,13 @@ public final class CraftServer implements Server { org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config diff --git a/patches/server/0044-BBOR-Protocol.patch b/patches/server/0044-BBOR-Protocol.patch index addb59b..eb0187a 100644 --- a/patches/server/0044-BBOR-Protocol.patch +++ b/patches/server/0044-BBOR-Protocol.patch @@ -18,7 +18,7 @@ index 755f0d3631b733799d2cb07a22b0bed8a7ab9e9d..e7f1e2440c067ebf8c1c2d175d413de6 for (int i = 0; i < this.tickables.size(); ++i) { ((Runnable) this.tickables.get(i)).run(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index adae87a679f8bd6d42d472b56cdc0a7806bc9910..551da6f66a319a62c800ea899d27ae7783269136 100644 +index 527f3ff0ff48582fad63fdde7612d250913c10ef..0a2cb031a3a4ed0ba7a62c782a737cb02207f8dd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3554,6 +3554,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -77,10 +77,10 @@ index cc224af0139a6e3adefd22cbfa0cd519735b7191..2c3ca05644bc97d505e8ca92e7a5f486 public Level getLevel() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c7f113730842f643b5c764d32e8c30d6df73648d..2ef8eac38e5136defacc8904480a21d2bd20b325 100644 +index 31c7ec216108388954694c1ca0ae26d23c0c4c3c..6a8c524d401e421dbf6aa7a40d12e1e1b44f6110 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1062,6 +1062,13 @@ public final class CraftServer implements Server { +@@ -1065,6 +1065,13 @@ public final class CraftServer implements Server { top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal(); } // Leaves end - pca diff --git a/patches/server/0047-Jade-Protocol.patch b/patches/server/0047-Jade-Protocol.patch index 2eeba71..20800ea 100644 --- a/patches/server/0047-Jade-Protocol.patch +++ b/patches/server/0047-Jade-Protocol.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Jade Protocol This patch is Powered by Jade(https://github.com/Snownee/Jade) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 551da6f66a319a62c800ea899d27ae7783269136..0acb073649a286f9756974e941aa5da7ed09ed0d 100644 +index 0a2cb031a3a4ed0ba7a62c782a737cb02207f8dd..35295d8577acf11bd701ef2a7aa1bab3784c7274 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3557,6 +3557,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -45,10 +45,10 @@ index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..fe8c9b7e7956837829b4fe3eb449b2c0 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2ef8eac38e5136defacc8904480a21d2bd20b325..69868f675624ad3b2c4742572a2b2c4970956147 100644 +index 6a8c524d401e421dbf6aa7a40d12e1e1b44f6110..6888d0b096b665a10cf6b050a4e69be1b7d7928d 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 { +@@ -466,6 +466,7 @@ public final class CraftServer implements Server { } datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper top.leavesmc.leaves.protocol.PcaSyncProtocol.init(); // Leaves - pca @@ -56,7 +56,7 @@ index 2ef8eac38e5136defacc8904480a21d2bd20b325..69868f675624ad3b2c4742572a2b2c49 } public boolean getCommandBlockOverride(String command) { -@@ -1069,6 +1070,11 @@ public final class CraftServer implements Server { +@@ -1072,6 +1073,11 @@ public final class CraftServer implements Server { top.leavesmc.leaves.protocol.BBORProtocol.loggedOutAllPlayer(); } // Leaves end - bbor diff --git a/patches/server/0051-Stackable-ShulkerBoxes.patch b/patches/server/0051-Stackable-ShulkerBoxes.patch index 87ed95d..33a4a72 100644 --- a/patches/server/0051-Stackable-ShulkerBoxes.patch +++ b/patches/server/0051-Stackable-ShulkerBoxes.patch @@ -6,13 +6,13 @@ Subject: [PATCH] Stackable ShulkerBoxes This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet) and plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition) diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 3d41dbe0285f8fec8adae1e93010cf464df9b08c..7f5c131b16152c7817b0a29064dacdf405f6e6e5 100644 +index 52196431a6538872755344859a0454a0e50c3b6e..46d51b33cf68eaf759b437862778006e95861942 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -15,10 +15,12 @@ import net.minecraft.world.entity.EntityType; +@@ -14,10 +14,12 @@ import net.minecraft.world.entity.Entity; + import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MoverType; import net.minecraft.world.entity.TraceableEntity; - import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -22,15 +22,15 @@ index 3d41dbe0285f8fec8adae1e93010cf464df9b08c..7f5c131b16152c7817b0a29064dacdf4 import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.Vec3; import net.minecraft.core.BlockPos; -@@ -32,6 +34,7 @@ import net.minecraft.server.MinecraftServer; - import net.minecraft.server.level.ServerLevel; - import net.minecraft.sounds.SoundSource; +@@ -33,6 +35,7 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; + import org.bukkit.craftbukkit.event.CraftEventFactory; + import org.bukkit.entity.Player; +import org.bukkit.block.ShulkerBox; import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.player.PlayerPickupItemEvent; // CraftBukkit end -@@ -70,6 +73,13 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -71,6 +74,13 @@ public class ItemEntity extends Entity implements TraceableEntity { this.setDeltaMovement(this.random.nextDouble() * 0.2D - 0.1D, 0.2D, this.random.nextDouble() * 0.2D - 0.1D); this.setItem(stack); // Paper end @@ -44,14 +44,14 @@ index 3d41dbe0285f8fec8adae1e93010cf464df9b08c..7f5c131b16152c7817b0a29064dacdf4 } public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) { -@@ -288,10 +298,49 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -289,10 +299,49 @@ public class ItemEntity extends Entity implements TraceableEntity { private boolean isMergable() { ItemStack itemstack = this.getItem(); - return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && itemstack.getCount() < itemstack.getMaxStackSize(); // Paper - respect despawn rate in pickup check. + return this.isAlive() && this.pickupDelay != 32767 && this.age != -32768 && this.age < this.despawnRate && itemstack.getCount() < top.leavesmc.leaves.util.ShulkerBoxUtils.getItemStackMaxCount(itemstack); // Paper - respect despawn rate in pickup check. // Leaves - stackable shulker boxes -+ } -+ + } + + // Leaves end - stackable shulker boxes + private boolean tryStackShulkerBoxes(ItemEntity other) { + ItemStack selfStack = this.getItem(); @@ -83,9 +83,9 @@ index 3d41dbe0285f8fec8adae1e93010cf464df9b08c..7f5c131b16152c7817b0a29064dacdf4 + return true; + } + return false; - } ++ } + // Leaves end - stackable shulker boxes - ++ private void tryToMerge(ItemEntity other) { + // Leaves start - stackable shulker boxes + if (tryStackShulkerBoxes(other)) { diff --git a/patches/server/0053-MC-Technical-Survival-Mode.patch b/patches/server/0053-MC-Technical-Survival-Mode.patch index 328f561..51e1d04 100644 --- a/patches/server/0053-MC-Technical-Survival-Mode.patch +++ b/patches/server/0053-MC-Technical-Survival-Mode.patch @@ -18,7 +18,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..4a0da4436998fc21506996216bd9c094 throw new RuntimeException("Could not reload paper configuration files", ex); } diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java -index 5465711d486e5f265a26042031e895fb09e30608..4d1d5977e84ea8e2143c58c45e87d80f7bf2bbe1 100644 +index ffc5b68c4246a7111845230a75552bb15875a209..990cdebf1b9e64a5001c71411e64f68108aef47f 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java @@ -67,7 +67,7 @@ public class EndCrystal extends Entity { @@ -31,10 +31,10 @@ index 5465711d486e5f265a26042031e895fb09e30608..4d1d5977e84ea8e2143c58c45e87d80f || ((ServerLevel) this.level()).getDragonFight() == null || ((ServerLevel) this.level()).getDragonFight().respawnStage == null diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java -index bf3301eb1341ba9d482e10873447c42bd670f5ed..bbb322df340cd0b188603a427f58f8c1c3474bda 100644 +index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..25a01ca42b8f2f0590965edbeca9c1f95cd66420 100644 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java -@@ -60,7 +60,7 @@ public class PrimedTnt extends Entity implements TraceableEntity { +@@ -63,7 +63,7 @@ public class PrimedTnt extends Entity implements TraceableEntity { @Override public void tick() { @@ -70,7 +70,7 @@ index c767257b56acbe2cde391f405c010f5b2f62a17c..4327ec0948fb82939272f2dc1bbde8b1 entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) { continue; diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 2aa2f773de6a981c5f035ef2bfdc568b04ebf190..8cc74b1eb94ca5e246a667aada013de3af3a4c45 100644 +index 67d05e317c2140fcfa5591e6fd6e7e28cfafe1ee..ae49a4d1316c26450cb672ced3342887bda61fde 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -2,6 +2,7 @@ package top.leavesmc.leaves; diff --git a/patches/server/0054-Return-nether-portal-fix.patch b/patches/server/0054-Return-nether-portal-fix.patch index 66e9c8b..8985d9a 100644 --- a/patches/server/0054-Return-nether-portal-fix.patch +++ b/patches/server/0054-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 ac1b3ca7a7e0f2563e194650d4df8579abc2569f..246afa286ae66788c45b6c58108ff200bbb92f6b 100644 +index f60fdf00078572d6aeb5257f622353aeac7ff862..48574d37929c7aeaec6b6f7b4887b13fbd54c11a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -186,6 +186,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -121,10 +121,10 @@ index 52b7d704f1a13e215da586a45da9c554f40f3d86..3994583f24bd558e7b0f7649e27fcea7 // 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 92bca97b2c72c8fb58b8c950cf7a775bc675ca55..1a21eb3db3c25b76fdc3f1c568bc57fc2d96cbf1 100644 +index dfce80a9e4736f8545d20713ebd4d4d0fd377a10..deaba5f2c0f684451d9cac5d1eb73fe7bcc36210 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -243,7 +243,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -242,7 +242,7 @@ public abstract class LivingEntity extends Entity implements Attackable { protected ItemStack useItem; protected int useItemRemaining; protected int fallFlyTicks; diff --git a/patches/server/0055-Appleskin-Protocol.patch b/patches/server/0055-Appleskin-Protocol.patch index bd3abe3..4926756 100644 --- a/patches/server/0055-Appleskin-Protocol.patch +++ b/patches/server/0055-Appleskin-Protocol.patch @@ -37,10 +37,10 @@ index 3994583f24bd558e7b0f7649e27fcea79da32026..dc1c9c106593aed9ede4ea4a09dc085c 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 69868f675624ad3b2c4742572a2b2c4970956147..25681269cc05644c04066bfa8b220af68fecf0a2 100644 +index 6888d0b096b665a10cf6b050a4e69be1b7d7928d..e2fc4933f8e1faaed5837e54588a20582090dc65 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1075,6 +1075,13 @@ public final class CraftServer implements Server { +@@ -1078,6 +1078,13 @@ public final class CraftServer implements Server { top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer(); } // Leaves end - Jade diff --git a/patches/server/0058-Use-vanilla-random-config.patch b/patches/server/0058-Use-vanilla-random-config.patch index e9d6501..349a13a 100644 --- a/patches/server/0058-Use-vanilla-random-config.patch +++ b/patches/server/0058-Use-vanilla-random-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use vanilla random config diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6addc14f1c6366da14662c445bc90d3017e7ac72..9d785bffce91ff709492e24981f8caaa4e7edf0f 100644 +index afecf33c1df964decad84636c4e588369ad5ea8a..5094a84eab7109b138b5b44562c1ee9bc57ca8ad 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -568,7 +568,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -18,15 +18,15 @@ index 6addc14f1c6366da14662c445bc90d3017e7ac72..9d785bffce91ff709492e24981f8caaa this.fluidHeight = new Object2DoubleArrayMap(2); this.fluidOnEyes = new HashSet(); diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java -index b72006c4b2342ca9d9a81f54f89fa6d979c33c85..4bcaf4387b509df13e8798990f363a545a27a15d 100644 +index f60c4cd0543fd5d50fa7e2c1a9e8381227adb540..8c9c694744951dc11b9f8828f27e4d4a2210a3bc 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java -@@ -46,7 +46,7 @@ public class Squid extends WaterAnimal { +@@ -44,7 +44,7 @@ public class Squid extends WaterAnimal { public Squid(EntityType type, Level world) { super(type, world); -- //this.random.setSeed((long) this.getId()); // Paper - we set the random to shared, do not clobber the seed -+ if (top.leavesmc.leaves.LeavesConfig.useVanillaRandom) this.random.setSeed((long) this.getId()); // Paper - we set the random to shared, do not clobber the seed // Leaves - vanilla plz +- //this.random.setSeed((long)this.getId()); // Paper - we set the random to shared, do not clobber the seed ++ if (top.leavesmc.leaves.LeavesConfig.useVanillaRandom) this.random.setSeed(this.getId()); // Paper - we set the random to shared, do not clobber the seed // Leaves - vanilla plz this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F; } diff --git a/patches/server/0069-Despawn-enderman-with-block.patch b/patches/server/0069-Despawn-enderman-with-block.patch index d5e489d..b924c1c 100644 --- a/patches/server/0069-Despawn-enderman-with-block.patch +++ b/patches/server/0069-Despawn-enderman-with-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Despawn enderman with block diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index b88fad64de2e4af5f0199632ae7f0a06f8288824..4bf256108047b7ade219d6aa60b0adc5f1272afc 100644 +index 7e19c96e92f821836702969aef4628f29155e519..85a414d35b12908ed8e74e44e948a8a4e1e1cf3b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -475,7 +475,7 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -479,7 +479,7 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean requiresCustomPersistence() {