diff --git a/patches/server/0009-Allow-vanilla-properties-def.patch b/patches/server/0009-Allow-vanilla-properties-def.patch deleted file mode 100644 index 9e1f8fb6..00000000 --- a/patches/server/0009-Allow-vanilla-properties-def.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> -Date: Wed, 2 Feb 2022 00:43:25 +0800 -Subject: [PATCH] Allow vanilla properties def - - -diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..c04b68b679f8fde29bb246b5fd0262e0bd1d7356 100644 ---- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -135,12 +135,12 @@ public class GlobalConfiguration extends ConfigurationPart { - - public class UnsupportedSettings extends ConfigurationPart { - @Comment("This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.") -- public boolean allowPermanentBlockBreakExploits = false; -+ public boolean allowPermanentBlockBreakExploits = true; - @Comment("This setting controls if player should be able to use TNT duplication, but this also allows duplicating carpet, rails and potentially other items") -- public boolean allowPistonDuplication = false; -+ public boolean allowPistonDuplication = true; - public boolean performUsernameValidation = true; - @Comment("This setting controls if players should be able to create headless pistons.") -- public boolean allowHeadlessPistons = false; -+ public boolean allowHeadlessPistons = true; - @Comment("This setting controls if grindstones should be able to output overstacked items (such as cursed books).") - public boolean allowGrindstoneOverstacking = false; - } diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0009-Fakeplayer-support.patch similarity index 100% rename from patches/server/0010-Fakeplayer-support.patch rename to patches/server/0009-Fakeplayer-support.patch diff --git a/patches/server/0011-Make-shears-in-dispenser-can-unlimited-use.patch b/patches/server/0010-Make-shears-in-dispenser-can-unlimited-use.patch similarity index 97% rename from patches/server/0011-Make-shears-in-dispenser-can-unlimited-use.patch rename to patches/server/0010-Make-shears-in-dispenser-can-unlimited-use.patch index 0a385aad..d9721c0f 100644 --- a/patches/server/0011-Make-shears-in-dispenser-can-unlimited-use.patch +++ b/patches/server/0010-Make-shears-in-dispenser-can-unlimited-use.patch @@ -18,7 +18,7 @@ index d1127d93a85a837933d0d73c24cacac4adc3a5b9..bca725f614893458f825768e8dfb6ff9 } } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 14e80a17e332229c2cfa5e954ab21dee814ec141..8b976c3bfacc040160ad1bab396700f7c44ba0f6 100644 +index 57567e12bab0cb7d5c59957232a2bd2a40020360..7e1f17807860847792c8a599301cc942768e0931 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -104,10 +104,12 @@ public final class LeavesConfig { diff --git a/patches/server/0012-Redstone-Shears-Wrench.patch b/patches/server/0011-Redstone-Shears-Wrench.patch similarity index 98% rename from patches/server/0012-Redstone-Shears-Wrench.patch rename to patches/server/0011-Redstone-Shears-Wrench.patch index 2ea4977f..ab40cd71 100644 --- a/patches/server/0012-Redstone-Shears-Wrench.patch +++ b/patches/server/0011-Redstone-Shears-Wrench.patch @@ -98,7 +98,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..c9310e88b3a967cb9cacb80288e74757 + // Leaves end - shears wrench } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 8b976c3bfacc040160ad1bab396700f7c44ba0f6..1b7024efd3da857e6242f5e6d3691a9bf609b05f 100644 +index 7e1f17807860847792c8a599301cc942768e0931..9517e2afa18256f6f1c7e8b670ee9012fa55ecf6 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -105,11 +105,13 @@ public final class LeavesConfig { diff --git a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0012-Add-isShrink-to-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch rename to patches/server/0012-Add-isShrink-to-EntityResurrectEvent.patch diff --git a/patches/server/0014-Budding-Amethyst-can-push-by-piston.patch b/patches/server/0013-Budding-Amethyst-can-push-by-piston.patch similarity index 96% rename from patches/server/0014-Budding-Amethyst-can-push-by-piston.patch rename to patches/server/0013-Budding-Amethyst-can-push-by-piston.patch index ed16ab0e..87526e21 100644 --- a/patches/server/0014-Budding-Amethyst-can-push-by-piston.patch +++ b/patches/server/0013-Budding-Amethyst-can-push-by-piston.patch @@ -21,7 +21,7 @@ index bedccb8717d08d5a60058445b04ddff149e7d36c..2b452ae8d26107973f503451164f65de } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 1b7024efd3da857e6242f5e6d3691a9bf609b05f..90d22a33c38ea539cedb5cd1f63619972df13962 100644 +index 9517e2afa18256f6f1c7e8b670ee9012fa55ecf6..590db5dac5c78992170003498ec83b5ee531d760 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -106,12 +106,14 @@ public final class LeavesConfig { diff --git a/patches/server/0015-Spectator-dont-get-Advancement.patch b/patches/server/0014-Spectator-dont-get-Advancement.patch similarity index 97% rename from patches/server/0015-Spectator-dont-get-Advancement.patch rename to patches/server/0014-Spectator-dont-get-Advancement.patch index daa519ed..e4af9cfb 100644 --- a/patches/server/0015-Spectator-dont-get-Advancement.patch +++ b/patches/server/0014-Spectator-dont-get-Advancement.patch @@ -29,7 +29,7 @@ index 8873e12cbd3d6f9071efedb35ea3c69c78033d78..1fdaa8a9993dd6881877a3b00b02487a AdvancementProgress advancementprogress = this.getOrStartProgress(advancement); boolean flag1 = advancementprogress.isDone(); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 90d22a33c38ea539cedb5cd1f63619972df13962..59f169622012e3fadbd7f3394ccaa2d2dc2ebb8e 100644 +index 590db5dac5c78992170003498ec83b5ee531d760..82f97f13671b0acfa43d1f2d8f4d24d10645c039 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -107,6 +107,7 @@ public final class LeavesConfig { diff --git a/patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch b/patches/server/0015-Stick-can-change-ArmorStand-arm-status.patch similarity index 97% rename from patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch rename to patches/server/0015-Stick-can-change-ArmorStand-arm-status.patch index 30c37c51..f65d24ab 100644 --- a/patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch +++ b/patches/server/0015-Stick-can-change-ArmorStand-arm-status.patch @@ -22,7 +22,7 @@ index b136cdc13d94bc34c998a1986e0c93525356ac5c..a1dd65d71606e1da07be781bf95a3268 return InteractionResult.FAIL; } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 59f169622012e3fadbd7f3394ccaa2d2dc2ebb8e..c3557e412dc5a91e51b6c7058566f27833205069 100644 +index 82f97f13671b0acfa43d1f2d8f4d24d10645c039..4d1d7acfacc569ea376c2c519b57e368680b1656 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -108,6 +108,7 @@ public final class LeavesConfig { diff --git a/patches/server/0017-Fix-tripwire-update.patch b/patches/server/0016-Fix-tripwire-update.patch similarity index 100% rename from patches/server/0017-Fix-tripwire-update.patch rename to patches/server/0016-Fix-tripwire-update.patch diff --git a/patches/server/0018-No-chat-sign.patch b/patches/server/0017-No-chat-sign.patch similarity index 99% rename from patches/server/0018-No-chat-sign.patch rename to patches/server/0017-No-chat-sign.patch index 69f77f7e..32b3b49a 100644 --- a/patches/server/0018-No-chat-sign.patch +++ b/patches/server/0017-No-chat-sign.patch @@ -208,7 +208,7 @@ index 5a5a3f84138b2f9a55f0a7c17004194dd324ebb4..04885ae3016559e2f1cb6359ad8b558e // CraftBukkit start diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index c3557e412dc5a91e51b6c7058566f27833205069..8d3dfe2386e977eb79fd40ecb5eb728ced83b420 100644 +index 4d1d7acfacc569ea376c2c519b57e368680b1656..a3c797fd88880dd649cb0e80f472ce51614ba219 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -109,6 +109,7 @@ public final class LeavesConfig { diff --git a/patches/server/0019-Optimize-mob-spawning.patch b/patches/server/0018-Optimize-mob-spawning.patch similarity index 99% rename from patches/server/0019-Optimize-mob-spawning.patch rename to patches/server/0018-Optimize-mob-spawning.patch index 6d218090..73b67f54 100644 --- a/patches/server/0019-Optimize-mob-spawning.patch +++ b/patches/server/0018-Optimize-mob-spawning.patch @@ -151,7 +151,7 @@ index 4cdfc433df67afcd455422e9baf56f167dd712ae..a6e0f5dab21d806e0c7744b2a337cded private void ensureActiveIsNotIterated() { // Paper - replace with better logic, do not delay removals diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 8d3dfe2386e977eb79fd40ecb5eb728ced83b420..0dbae8e8739b759d10b14ba69c19e863b009b89a 100644 +index a3c797fd88880dd649cb0e80f472ce51614ba219..c48c2cbe2d3fcbed78c273c36802b27dbaa2da38 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -220,7 +220,16 @@ public final class LeavesConfig { diff --git a/patches/server/0020-Dont-send-useless-entity-packets.patch b/patches/server/0019-Dont-send-useless-entity-packets.patch similarity index 98% rename from patches/server/0020-Dont-send-useless-entity-packets.patch rename to patches/server/0019-Dont-send-useless-entity-packets.patch index fa8e46ee..dc027145 100644 --- a/patches/server/0020-Dont-send-useless-entity-packets.patch +++ b/patches/server/0019-Dont-send-useless-entity-packets.patch @@ -69,7 +69,7 @@ index 190e9761087baec5827d722a8281f0ffb6798341..158da4c3b002a4948bfb214337aa28a5 this.entity.stopSeenByPlayer(player); player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()})); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 0dbae8e8739b759d10b14ba69c19e863b009b89a..fc3125bba031fd6b02d4c308a441bc57750e4363 100644 +index c48c2cbe2d3fcbed78c273c36802b27dbaa2da38..e8308375c91cdb136f1611baaf108c9078365331 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -230,6 +230,11 @@ public final class LeavesConfig { diff --git a/patches/server/0021-Multithreaded-Tracker.patch b/patches/server/0020-Multithreaded-Tracker.patch similarity index 99% rename from patches/server/0021-Multithreaded-Tracker.patch rename to patches/server/0020-Multithreaded-Tracker.patch index f430ef68..324ad5af 100644 --- a/patches/server/0021-Multithreaded-Tracker.patch +++ b/patches/server/0020-Multithreaded-Tracker.patch @@ -174,7 +174,7 @@ index 158da4c3b002a4948bfb214337aa28a55b358fc9..2f8e77692811604fdc19bff6ba0faeea set.clear(); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index fc3125bba031fd6b02d4c308a441bc57750e4363..a9ec45f0e0da650d34480a61253e9944d56dac1e 100644 +index e8308375c91cdb136f1611baaf108c9078365331..6dee4f2e180f6676d4f09ea1e375fb8b4231f675 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -235,6 +235,20 @@ public final class LeavesConfig { diff --git a/patches/server/0022-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch b/patches/server/0021-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch similarity index 95% rename from patches/server/0022-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch rename to patches/server/0021-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch index 5455a260..53d7b121 100644 --- a/patches/server/0022-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch +++ b/patches/server/0021-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch @@ -18,7 +18,7 @@ index 26bf383caea68834c654b25653ced9017f1b1b22..71e3c7fc5c071e83dfeca6954771e559 this.blockPos = mutableBlockPos; setTargetPosition(mutableBlockPos.immutable()); // Paper diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index a9ec45f0e0da650d34480a61253e9944d56dac1e..1476e2433ed07d3e1ec86ee0e3a84c7e6f16a147 100644 +index 6dee4f2e180f6676d4f09ea1e375fb8b4231f675..bf78a4cda81b8e1b60b4e0077657a04c49232b1a 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -249,6 +249,11 @@ public final class LeavesConfig { diff --git a/patches/server/0023-Optimize-entity-coordinate-key.patch b/patches/server/0022-Optimize-entity-coordinate-key.patch similarity index 93% rename from patches/server/0023-Optimize-entity-coordinate-key.patch rename to patches/server/0022-Optimize-entity-coordinate-key.patch index a2f33e30..8130ef76 100644 --- a/patches/server/0023-Optimize-entity-coordinate-key.patch +++ b/patches/server/0022-Optimize-entity-coordinate-key.patch @@ -25,7 +25,7 @@ index d1a59c2af0557a816c094983ec60097fb4de060c..25e77520f269e25492d14d498f51c16b public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 07755625a713359e468eb907fdc7667e719a28a7..a4f32bb4d474c97e9b924e1d275f640ddfedc31f 100644 +index 43873929f11e373186190b3ae831dc68bfa69616..2433315c13e2da90f4f208d180d487c984a087ea 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -38,7 +38,7 @@ index 07755625a713359e468eb907fdc7667e719a28a7..a4f32bb4d474c97e9b924e1d275f640d private Vec3 deltaMovement; private float yRot; diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 1476e2433ed07d3e1ec86ee0e3a84c7e6f16a147..5856270f8f4e0eb6b89ed36b361af958066d341c 100644 +index bf78a4cda81b8e1b60b4e0077657a04c49232b1a..ab3d6372712b9956d731ea273064b8e2657e5361 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -254,6 +254,12 @@ public final class LeavesConfig { diff --git a/patches/server/0024-Optimize-suffocation.patch b/patches/server/0023-Optimize-suffocation.patch similarity index 96% rename from patches/server/0024-Optimize-suffocation.patch rename to patches/server/0023-Optimize-suffocation.patch index 5cd2c138..762c3e37 100644 --- a/patches/server/0024-Optimize-suffocation.patch +++ b/patches/server/0023-Optimize-suffocation.patch @@ -35,7 +35,7 @@ index f577dcc95bba43a2aa8a3a54b3afbcf50e93d52b..42f89171251a5f2dcd6e75eaa1135b34 public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 5856270f8f4e0eb6b89ed36b361af958066d341c..317e145bd2f17fc97a64e87b81589d22fb6c716a 100644 +index ab3d6372712b9956d731ea273064b8e2657e5361..0d05fef5f9cf63dd089f46507e600e60a7f7a93b 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -259,6 +259,10 @@ public final class LeavesConfig { diff --git a/patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 98% rename from patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch index 1c926c8c..821200e9 100644 --- a/patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch +++ b/patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch @@ -142,7 +142,7 @@ index 856055eeac058290b9b2146a11f5faccd1873df0..3fd487f9302f428171539e18f09f05c9 return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 317e145bd2f17fc97a64e87b81589d22fb6c716a..748bbcc2e0e8c019e9f7e7591adebf76c3ac2538 100644 +index 0d05fef5f9cf63dd089f46507e600e60a7f7a93b..90946e96453721bf060dd0b95d39ab760ce47b1d 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -264,6 +264,11 @@ public final class LeavesConfig { diff --git a/patches/server/0026-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0025-Only-check-for-spooky-season-once-an-hour.patch similarity index 96% rename from patches/server/0026-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0025-Only-check-for-spooky-season-once-an-hour.patch index c4a9a802..e3265158 100644 --- a/patches/server/0026-Only-check-for-spooky-season-once-an-hour.patch +++ b/patches/server/0025-Only-check-for-spooky-season-once-an-hour.patch @@ -45,7 +45,7 @@ index 320c558bbe80d4bbc641e895ec43cfa2b45e8d70..f57572620288d8f0e024d43a4e11e212 @Override protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 748bbcc2e0e8c019e9f7e7591adebf76c3ac2538..ed70b41e81473abecd5b10a2afa8dd8ae184870c 100644 +index 90946e96453721bf060dd0b95d39ab760ce47b1d..ec94bdbeac0bd9877a23f7d34d24e26b4eeb305d 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -269,6 +269,11 @@ public final class LeavesConfig { diff --git a/patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch b/patches/server/0026-Move-ThreadUnsafeRandom-Initialization.patch similarity index 100% rename from patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch rename to patches/server/0026-Move-ThreadUnsafeRandom-Initialization.patch diff --git a/patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch similarity index 98% rename from patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch index e99b10d5..022273c7 100644 --- a/patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch +++ b/patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch @@ -93,7 +93,7 @@ index 28e4b302284f955a73e75d0f4276d55fb51826f5..1bf1af06fbd6501e98def7997c487c42 public org.bukkit.Chunk bukkitChunk; diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index ed70b41e81473abecd5b10a2afa8dd8ae184870c..a64bdc9e6f43f841ecb13e7ec53102ec75ea485f 100644 +index ec94bdbeac0bd9877a23f7d34d24e26b4eeb305d..b37daf01183089c021878d551ecc56be8256cc3c 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -274,6 +274,15 @@ public final class LeavesConfig { diff --git a/patches/server/0029-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0028-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 95% rename from patches/server/0029-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0028-Skip-POI-finding-if-stuck-in-vehicle.patch index f4205173..b2d2f4fe 100644 --- a/patches/server/0029-Skip-POI-finding-if-stuck-in-vehicle.patch +++ b/patches/server/0028-Skip-POI-finding-if-stuck-in-vehicle.patch @@ -22,7 +22,7 @@ index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..44fc394dbab7e05a3bd7cab493300a96 long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> { return !entry.getValue().isStillValid(time); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index a64bdc9e6f43f841ecb13e7ec53102ec75ea485f..85e3bc9e5ebfc6662609f13c2145e16208ac1ee2 100644 +index b37daf01183089c021878d551ecc56be8256cc3c..69e1cfad36ef7b5117f85a3771e4f5cc7896a5db 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -283,6 +283,11 @@ public final class LeavesConfig { diff --git a/patches/server/0030-Early-return-optimization-for-target-finding.patch b/patches/server/0029-Early-return-optimization-for-target-finding.patch similarity index 96% rename from patches/server/0030-Early-return-optimization-for-target-finding.patch rename to patches/server/0029-Early-return-optimization-for-target-finding.patch index 235d74a8..b9f41389 100644 --- a/patches/server/0030-Early-return-optimization-for-target-finding.patch +++ b/patches/server/0029-Early-return-optimization-for-target-finding.patch @@ -29,7 +29,7 @@ index a7575b5ef56af6f53448d391abb4956e130148ca..e2764cbc888be39943728ff810e1e44b return false; } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 85e3bc9e5ebfc6662609f13c2145e16208ac1ee2..633e2a82e3da2f50df0c3dd3e1d04d48db0f3f65 100644 +index 69e1cfad36ef7b5117f85a3771e4f5cc7896a5db..f012ef7ed859713ed7f9dec660980d0dc1ed3b85 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -287,6 +287,11 @@ public final class LeavesConfig { diff --git a/patches/server/0031-Use-thread-unsafe-random-for-mob-spawning.patch b/patches/server/0030-Use-thread-unsafe-random-for-mob-spawning.patch similarity index 97% rename from patches/server/0031-Use-thread-unsafe-random-for-mob-spawning.patch rename to patches/server/0030-Use-thread-unsafe-random-for-mob-spawning.patch index a295f794..b8a7027c 100644 --- a/patches/server/0031-Use-thread-unsafe-random-for-mob-spawning.patch +++ b/patches/server/0030-Use-thread-unsafe-random-for-mob-spawning.patch @@ -38,7 +38,7 @@ index 01b21f520ef1c834b9bafc3de85c1fa4fcf539d6..1a239af1c3fc254927979752d2ee18e7 public static boolean isValidEmptySpawnBlock(BlockGetter blockView, BlockPos pos, BlockState state, FluidState fluidState, EntityType entityType) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 633e2a82e3da2f50df0c3dd3e1d04d48db0f3f65..9c3aef2156647d2e1cca49f87f80e880f857fcdd 100644 +index f012ef7ed859713ed7f9dec660980d0dc1ed3b85..a77c68ccfde65df47a1e52487397a9f2549d0eaf 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -293,6 +293,11 @@ public final class LeavesConfig { diff --git a/patches/server/0032-Config-to-disable-method-profiler.patch b/patches/server/0031-Config-to-disable-method-profiler.patch similarity index 96% rename from patches/server/0032-Config-to-disable-method-profiler.patch rename to patches/server/0031-Config-to-disable-method-profiler.patch index 87be0dff..207fa932 100644 --- a/patches/server/0032-Config-to-disable-method-profiler.patch +++ b/patches/server/0031-Config-to-disable-method-profiler.patch @@ -38,7 +38,7 @@ index 7d6fe65dc64afa00ecef0d1be2e13507086ab81a..dda31b5eea92ce3de9de0e4054ee9c7f } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 9c3aef2156647d2e1cca49f87f80e880f857fcdd..d08e08bc7dbb5a1ed0a11d50d09ab22089429167 100644 +index a77c68ccfde65df47a1e52487397a9f2549d0eaf..a1a80291b856098ca1f42816b34ad1d9727dee91 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -298,6 +298,11 @@ public final class LeavesConfig { diff --git a/patches/server/0033-Throttle-goal-selector-during-inactive-ticking.patch b/patches/server/0032-Throttle-goal-selector-during-inactive-ticking.patch similarity index 95% rename from patches/server/0033-Throttle-goal-selector-during-inactive-ticking.patch rename to patches/server/0032-Throttle-goal-selector-during-inactive-ticking.patch index c6532dd0..c1d44fde 100644 --- a/patches/server/0033-Throttle-goal-selector-during-inactive-ticking.patch +++ b/patches/server/0032-Throttle-goal-selector-during-inactive-ticking.patch @@ -25,7 +25,7 @@ index 49b983064ea810382b6112f5dc7f93ba4e5710bd..3948d4c6bf1f3942b6496ee2a8876665 } if (this.targetSelector.inactiveTick()) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index d08e08bc7dbb5a1ed0a11d50d09ab22089429167..f5d5b55725d7f57769cee38129851a3a3afde45f 100644 +index a1a80291b856098ca1f42816b34ad1d9727dee91..d804f1a818582caa6237bb2c582899e4d15e2bd4 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -303,6 +303,11 @@ public final class LeavesConfig { diff --git a/patches/server/0034-Skip-cloning-loot-parameters.patch b/patches/server/0033-Skip-cloning-loot-parameters.patch similarity index 96% rename from patches/server/0034-Skip-cloning-loot-parameters.patch rename to patches/server/0033-Skip-cloning-loot-parameters.patch index 86153fcb..985d6af9 100644 --- a/patches/server/0034-Skip-cloning-loot-parameters.patch +++ b/patches/server/0033-Skip-cloning-loot-parameters.patch @@ -28,7 +28,7 @@ index 35f9b11a3a61976c952a2c1c64bb2a932538f54f..5d678cfca0a39aeed0881c3a38828fdc public boolean hasParam(LootContextParam parameter) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index f5d5b55725d7f57769cee38129851a3a3afde45f..98ddb7e0dfc65d0c59aca72d42c34bf9c6cd78b4 100644 +index d804f1a818582caa6237bb2c582899e4d15e2bd4..2054ccc423cff890033f8d80cb9ee28e437927cc 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -308,6 +308,11 @@ public final class LeavesConfig { diff --git a/patches/server/0035-Reduce-entity-allocations.patch b/patches/server/0034-Reduce-entity-allocations.patch similarity index 97% rename from patches/server/0035-Reduce-entity-allocations.patch rename to patches/server/0034-Reduce-entity-allocations.patch index 4a1a872a..c7a069ab 100644 --- a/patches/server/0035-Reduce-entity-allocations.patch +++ b/patches/server/0034-Reduce-entity-allocations.patch @@ -54,7 +54,7 @@ index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..53c094c8a674b2842009727569e7e1f6 @Nullable diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 98ddb7e0dfc65d0c59aca72d42c34bf9c6cd78b4..1f905774b480acbdfcaf53279b8d33b7af1044de 100644 +index 2054ccc423cff890033f8d80cb9ee28e437927cc..919d56eb9a0d96567eb6276bf598959227c36141 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -313,6 +313,11 @@ public final class LeavesConfig { diff --git a/patches/server/0036-Remove-lambda-from-ticking-guard.patch b/patches/server/0035-Remove-lambda-from-ticking-guard.patch similarity index 97% rename from patches/server/0036-Remove-lambda-from-ticking-guard.patch rename to patches/server/0035-Remove-lambda-from-ticking-guard.patch index 112e2fc3..bc2a4301 100644 --- a/patches/server/0036-Remove-lambda-from-ticking-guard.patch +++ b/patches/server/0035-Remove-lambda-from-ticking-guard.patch @@ -36,7 +36,7 @@ index c41ae38038fb0f9e2010c59bd25860c9051034bb..1b17976702676755c986512507bfc322 } } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 1f905774b480acbdfcaf53279b8d33b7af1044de..4ed2cb4cf22c3af23567ee06120d4dd6344a70f4 100644 +index 919d56eb9a0d96567eb6276bf598959227c36141..428afc2f7e533678445cba6c187750329e32d828 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -318,6 +318,11 @@ public final class LeavesConfig { diff --git a/patches/server/0037-Remove-iterators-from-inventory-contains.patch b/patches/server/0036-Remove-iterators-from-inventory-contains.patch similarity index 97% rename from patches/server/0037-Remove-iterators-from-inventory-contains.patch rename to patches/server/0036-Remove-iterators-from-inventory-contains.patch index 2d5aa1f5..1cfc8ebf 100644 --- a/patches/server/0037-Remove-iterators-from-inventory-contains.patch +++ b/patches/server/0036-Remove-iterators-from-inventory-contains.patch @@ -55,7 +55,7 @@ index 5bc033bf59d49eda1f8f2574165bbcbeab7faa0f..cf89cbffabf8b88265b5ffbc42b55fe6 } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 4ed2cb4cf22c3af23567ee06120d4dd6344a70f4..7aa5a818a9b4e4dc44c198cafb349813cc7518d1 100644 +index 428afc2f7e533678445cba6c187750329e32d828..8beeb99eb5ff087b97b60fe099c1bd6ba9ac8ea1 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -323,6 +323,11 @@ public final class LeavesConfig { diff --git a/patches/server/0038-Remove-streams-from-getting-nearby-players.patch b/patches/server/0037-Remove-streams-from-getting-nearby-players.patch similarity index 97% rename from patches/server/0038-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0037-Remove-streams-from-getting-nearby-players.patch index 2d7c163c..ea3d5bec 100644 --- a/patches/server/0038-Remove-streams-from-getting-nearby-players.patch +++ b/patches/server/0037-Remove-streams-from-getting-nearby-players.patch @@ -68,7 +68,7 @@ index 818952b1268688cf13a8ab22d38f05336bf740ad..c55eb9ef7217405c35661dbe03ae6be8 return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this)); } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 7aa5a818a9b4e4dc44c198cafb349813cc7518d1..84d4571f50c5dd4399cd3a0324b9adff28a929d5 100644 +index 8beeb99eb5ff087b97b60fe099c1bd6ba9ac8ea1..b3941d688d7ee9b53c5fd108463b9a1772b5b8c0 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -328,6 +328,11 @@ public final class LeavesConfig { diff --git a/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0038-Remove-streams-and-iterators-from-range-check.patch similarity index 97% rename from patches/server/0039-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0038-Remove-streams-and-iterators-from-range-check.patch index 236de1bc..d043f17f 100644 --- a/patches/server/0039-Remove-streams-and-iterators-from-range-check.patch +++ b/patches/server/0038-Remove-streams-and-iterators-from-range-check.patch @@ -65,7 +65,7 @@ index 634cde8069fc5ba467170a597e02da7c6b4e7b80..893475f58f649a40e3962092a3608636 return this.scaledRange(i); } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 84d4571f50c5dd4399cd3a0324b9adff28a929d5..8108e415b974a85c2ceff5967fe72e93ea7d1f93 100644 +index b3941d688d7ee9b53c5fd108463b9a1772b5b8c0..dcd2f7c64e5e69bc019e711bc9da126aa856b4e1 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -333,6 +333,11 @@ public final class LeavesConfig { diff --git a/patches/server/0040-Async-Pathfinding.patch b/patches/server/0039-Async-Pathfinding.patch similarity index 93% rename from patches/server/0040-Async-Pathfinding.patch rename to patches/server/0039-Async-Pathfinding.patch index b6748a08..555e6ebe 100644 --- a/patches/server/0040-Async-Pathfinding.patch +++ b/patches/server/0039-Async-Pathfinding.patch @@ -7,7 +7,7 @@ This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) But Pufferfish patch was ported downstream from the Petal fork diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 8108e415b974a85c2ceff5967fe72e93ea7d1f93..f9653c2e5856ae68c7cc81fcaf1bbaac2b363aef 100644 +index dcd2f7c64e5e69bc019e711bc9da126aa856b4e1..c90e7ed140ca5dae009e0c9b1823833755ddf5ab 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -338,6 +338,21 @@ public final class LeavesConfig { diff --git a/patches/server/0041-Cache-climbing-check-for-activation.patch b/patches/server/0040-Cache-climbing-check-for-activation.patch similarity index 96% rename from patches/server/0041-Cache-climbing-check-for-activation.patch rename to patches/server/0040-Cache-climbing-check-for-activation.patch index a32da7b1..fa4cb686 100644 --- a/patches/server/0041-Cache-climbing-check-for-activation.patch +++ b/patches/server/0040-Cache-climbing-check-for-activation.patch @@ -46,7 +46,7 @@ index e881584d38dc354204479863f004e974a0ac6c07..9f17c6acb54a7620656832df62e57e9d return 1; // Paper } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index f9653c2e5856ae68c7cc81fcaf1bbaac2b363aef..d847120f2b3c75eeed5694e455c8373b070a3e4a 100644 +index c90e7ed140ca5dae009e0c9b1823833755ddf5ab..d17b1ca548fa3ba8ea314d1d002418c520539582 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -353,6 +353,11 @@ public final class LeavesConfig { diff --git a/patches/server/0042-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0041-Use-aging-cache-for-biome-temperatures.patch similarity index 99% rename from patches/server/0042-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0041-Use-aging-cache-for-biome-temperatures.patch index b7d6d90e..5536c850 100644 --- a/patches/server/0042-Use-aging-cache-for-biome-temperatures.patch +++ b/patches/server/0041-Use-aging-cache-for-biome-temperatures.patch @@ -102,7 +102,7 @@ index c4f1173aab1e53412a65793e06238e637910475a..44bb45b391a365d4ca4dcd7e284edbb0 public boolean shouldFreeze(LevelReader world, BlockPos blockPos) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index d847120f2b3c75eeed5694e455c8373b070a3e4a..ef66f6516f7f20320ea6f372ab5ab5bce6059af2 100644 +index d17b1ca548fa3ba8ea314d1d002418c520539582..bed3e3d7978a822897144c97d7b35985ffdc2b30 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -358,6 +358,15 @@ public final class LeavesConfig { diff --git a/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 99% rename from patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch index ad9fc739..bd96cb01 100644 --- a/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch @@ -217,7 +217,7 @@ index b0c9fce9d4e06cac139e341d218d0b6aac1f1943..f53fee91b78ba4c1e17360a40d5a94fe }); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index ef66f6516f7f20320ea6f372ab5ab5bce6059af2..a9a08326fbfb1887ca77e10fa38fe080aa5021a7 100644 +index bed3e3d7978a822897144c97d7b35985ffdc2b30..29af6e47ad830291ad97c5fe388a55dce45853da 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -367,6 +367,11 @@ public final class LeavesConfig { diff --git a/patches/server/0044-Reduce-chunk-loading-lookups.patch b/patches/server/0043-Reduce-chunk-loading-lookups.patch similarity index 97% rename from patches/server/0044-Reduce-chunk-loading-lookups.patch rename to patches/server/0043-Reduce-chunk-loading-lookups.patch index 26ddb11a..0dd15152 100644 --- a/patches/server/0044-Reduce-chunk-loading-lookups.patch +++ b/patches/server/0043-Reduce-chunk-loading-lookups.patch @@ -42,7 +42,7 @@ index f4002ac7cba7d5e41b4f11b98212c625f6a92a65..6feeb3d30e45c5aba4e8204fe7e76f8f boolean flag1 = iblockdata.getFluidState().is(FluidTags.WATER); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index a9a08326fbfb1887ca77e10fa38fe080aa5021a7..8d2d6fe26e146131dcadb1e2ac5e182f91865410 100644 +index 29af6e47ad830291ad97c5fe388a55dce45853da..165b9c7b21dd0a18e78c8bf54a841d6d5a9d5718 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -372,6 +372,11 @@ public final class LeavesConfig { diff --git a/patches/server/0045-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch b/patches/server/0044-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch similarity index 98% rename from patches/server/0045-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch rename to patches/server/0044-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch index e678eaa9..b6dacc6e 100644 --- a/patches/server/0045-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch +++ b/patches/server/0044-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch @@ -73,7 +73,7 @@ index f7ea77dd82d978ad307f99c743efacfb34478b3d..96be7a7b030b2f82ac91f0c5c8e66f28 } } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 8d2d6fe26e146131dcadb1e2ac5e182f91865410..5212eb46f34ae1c143027d1ce8d001cb647dcfc4 100644 +index 165b9c7b21dd0a18e78c8bf54a841d6d5a9d5718..3b09a5435dbbc0f878f22d6cde90eea11880961b 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -377,6 +377,11 @@ public final class LeavesConfig { diff --git a/patches/server/0046-PCA-sync-protocol.patch b/patches/server/0045-PCA-sync-protocol.patch similarity index 99% rename from patches/server/0046-PCA-sync-protocol.patch rename to patches/server/0045-PCA-sync-protocol.patch index 745516ae..5dd219b3 100644 --- a/patches/server/0046-PCA-sync-protocol.patch +++ b/patches/server/0045-PCA-sync-protocol.patch @@ -35,7 +35,7 @@ index af8d49e22ee3447ea6acc4b64fcb5713734c8fd3..78f112575c2f8973e8aa66fb0fc44a18 byte[] data = new byte[packet.data.readableBytes()]; packet.data.readBytes(data); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f6c1dbde282e51322d655302340704e4a8af766f..7b309f0fd34ca1071f221d5b97288f400b69c00a 100644 +index 04885ae3016559e2f1cb6359ad8b558e19c3595a..4ea3a0ad550b95a6355d476760ec4a5db76f9b16 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -334,6 +334,7 @@ public abstract class PlayerList { @@ -369,7 +369,7 @@ index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e4 // 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)) diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 5212eb46f34ae1c143027d1ce8d001cb647dcfc4..3b2bba20f4ecf9f49ad13bd0a385cf791fcccb56 100644 +index 3b09a5435dbbc0f878f22d6cde90eea11880961b..e3081c3c7252fa779d4e81344d6446ce2d2c9423 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -382,6 +382,21 @@ public final class LeavesConfig { diff --git a/patches/server/0047-BBOR-Protocol.patch b/patches/server/0046-BBOR-Protocol.patch similarity index 99% rename from patches/server/0047-BBOR-Protocol.patch rename to patches/server/0046-BBOR-Protocol.patch index 30a9e550..abc2d1f7 100644 --- a/patches/server/0047-BBOR-Protocol.patch +++ b/patches/server/0046-BBOR-Protocol.patch @@ -95,7 +95,7 @@ index 82b588b0736f18d265c1ab269fcbd4e47509d61e..e8492a1bbf306473116974bde751b814 // 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)) diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 3b2bba20f4ecf9f49ad13bd0a385cf791fcccb56..95ae9149cce083e1902db0a0aa7f809fea55fb05 100644 +index e3081c3c7252fa779d4e81344d6446ce2d2c9423..aa7462d6a0fcf138c0e637dd23a28c8b9df7ee20 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -397,6 +397,11 @@ public final class LeavesConfig { diff --git a/patches/server/0048-InstantBlockUpdater-Reintroduced.patch b/patches/server/0047-InstantBlockUpdater-Reintroduced.patch similarity index 96% rename from patches/server/0048-InstantBlockUpdater-Reintroduced.patch rename to patches/server/0047-InstantBlockUpdater-Reintroduced.patch index 2572a4be..6623d4ad 100644 --- a/patches/server/0048-InstantBlockUpdater-Reintroduced.patch +++ b/patches/server/0047-InstantBlockUpdater-Reintroduced.patch @@ -33,7 +33,7 @@ index dda31b5eea92ce3de9de0e4054ee9c7f6df631e4..dd3868045923eed8c6eaf87a57d9bf7d this.getWorldBorder().world = (ServerLevel) this; // From PlayerList.setPlayerFileData diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 95ae9149cce083e1902db0a0aa7f809fea55fb05..1d61b1a375b6ab6c896940ba7d7d493e0d1e35ee 100644 +index aa7462d6a0fcf138c0e637dd23a28c8b9df7ee20..6ddc56070fcadc67758a6da72219e07f1a26257b 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -402,6 +402,15 @@ public final class LeavesConfig { diff --git a/patches/server/0049-Random-flatten-triangular-distribution.patch b/patches/server/0048-Random-flatten-triangular-distribution.patch similarity index 95% rename from patches/server/0049-Random-flatten-triangular-distribution.patch rename to patches/server/0048-Random-flatten-triangular-distribution.patch index dcc5811e..d6e9d137 100644 --- a/patches/server/0049-Random-flatten-triangular-distribution.patch +++ b/patches/server/0048-Random-flatten-triangular-distribution.patch @@ -26,7 +26,7 @@ index ff1ad1024419182f7f3de578442c1c033d4c9ebb..d93f3eeea17d58ccc01c6010b2d49f81 default void consumeCount(int count) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 1d61b1a375b6ab6c896940ba7d7d493e0d1e35ee..52304cb230a9d316e316adec86e0f7dc164c278f 100644 +index 6ddc56070fcadc67758a6da72219e07f1a26257b..f0e925352508b55ade469cd8907390a8410b2741 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -411,6 +411,11 @@ public final class LeavesConfig { diff --git a/patches/server/0050-Jade-Protocol.patch b/patches/server/0049-Jade-Protocol.patch similarity index 99% rename from patches/server/0050-Jade-Protocol.patch rename to patches/server/0049-Jade-Protocol.patch index ddcf3af6..9c7b0552 100644 --- a/patches/server/0050-Jade-Protocol.patch +++ b/patches/server/0049-Jade-Protocol.patch @@ -20,7 +20,7 @@ index 308879d9b04aa95a83926ba795da53ce39bff5ae..b1cd3f5a0b3bd969b4414e5f48bc3c2b ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7ee442a40b1e658d87faeefa08b2b08dee25b692..428eb52ba1e8055e27e9154c7f39977d914d7be0 100644 +index c93d74705bd0e3cc26674b1dad69f42adfb21439..6f991cab06ef7049fc0db02e6998d513e78b993d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -336,6 +336,7 @@ public abstract class PlayerList { @@ -69,7 +69,7 @@ index e8492a1bbf306473116974bde751b814ded4b031..b69f915226dd9cda4b5f24e307d89c19 // 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)) diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 52304cb230a9d316e316adec86e0f7dc164c278f..6d12088541bb511dc433c13fcc7e6ee60b06a7ab 100644 +index f0e925352508b55ade469cd8907390a8410b2741..1f416a269d683276efbff58c807dae516a7d8f3d 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -416,6 +416,11 @@ public final class LeavesConfig { diff --git a/patches/server/0051-Carpet-alternative-block-placement-Protocol.patch b/patches/server/0050-Carpet-alternative-block-placement-Protocol.patch similarity index 99% rename from patches/server/0051-Carpet-alternative-block-placement-Protocol.patch rename to patches/server/0050-Carpet-alternative-block-placement-Protocol.patch index 11970008..86aab2bf 100644 --- a/patches/server/0051-Carpet-alternative-block-placement-Protocol.patch +++ b/patches/server/0050-Carpet-alternative-block-placement-Protocol.patch @@ -78,7 +78,7 @@ index 7b71073027f4cf79736546500ededdfbb83d968e..085097d454869e46adafd1cff5908e39 public BlockState getStateForPlacement(BlockPlaceContext ctx) { return this.defaultBlockState(); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 6d12088541bb511dc433c13fcc7e6ee60b06a7ab..90a066960eb0a921d272ac040baf1126d640dc85 100644 +index 1f416a269d683276efbff58c807dae516a7d8f3d..bd8a724d0085adb6336339a7aba8a376c01b277e 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -421,6 +421,15 @@ public final class LeavesConfig { diff --git a/patches/server/0052-Player-operation-limiter.patch b/patches/server/0051-Player-operation-limiter.patch similarity index 98% rename from patches/server/0052-Player-operation-limiter.patch rename to patches/server/0051-Player-operation-limiter.patch index abcd4fa5..44937d02 100644 --- a/patches/server/0052-Player-operation-limiter.patch +++ b/patches/server/0051-Player-operation-limiter.patch @@ -132,7 +132,7 @@ index 3ab714721b51b039291b8e8a4b4da5118e18f5b7..1ee9c431282851882cdc337ea01ee590 return InteractionResult.FAIL; } else if (!this.placeBlock(blockactioncontext1, iblockdata)) { diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 90a066960eb0a921d272ac040baf1126d640dc85..9d96ca020c8b8c5d194bb5312ac7bf6d06bad03e 100644 +index bd8a724d0085adb6336339a7aba8a376c01b277e..4a922f5fe4eb884c4f9bbdb089b942b6af051c02 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -430,6 +430,11 @@ public final class LeavesConfig { diff --git a/patches/server/0053-Renewable-Elytra.patch b/patches/server/0052-Renewable-Elytra.patch similarity index 96% rename from patches/server/0053-Renewable-Elytra.patch rename to patches/server/0052-Renewable-Elytra.patch index 2eb14446..4596bc57 100644 --- a/patches/server/0053-Renewable-Elytra.patch +++ b/patches/server/0052-Renewable-Elytra.patch @@ -40,7 +40,7 @@ index aa8734856ec7b90036afad13bfda46c02e548812..5d3c60c2e216848c7bbaebbd9b4f8184 java.util.UUID spawningEntity; diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 9d96ca020c8b8c5d194bb5312ac7bf6d06bad03e..5ae57fa9c5421940e703c02a01a061fceb7cf374 100644 +index 4a922f5fe4eb884c4f9bbdb089b942b6af051c02..bfc4b33ab417be30dfa5af90d0192fb6e95a1e9a 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -435,6 +435,11 @@ public final class LeavesConfig { diff --git a/patches/server/0054-Stackable-ShulkerBoxes.patch b/patches/server/0053-Stackable-ShulkerBoxes.patch similarity index 100% rename from patches/server/0054-Stackable-ShulkerBoxes.patch rename to patches/server/0053-Stackable-ShulkerBoxes.patch diff --git a/patches/server/0055-Improve-fluid-direction-caching.patch b/patches/server/0054-Improve-fluid-direction-caching.patch similarity index 99% rename from patches/server/0055-Improve-fluid-direction-caching.patch rename to patches/server/0054-Improve-fluid-direction-caching.patch index 8064594e..5be98d3c 100644 --- a/patches/server/0055-Improve-fluid-direction-caching.patch +++ b/patches/server/0054-Improve-fluid-direction-caching.patch @@ -117,7 +117,7 @@ index 0ffc131baf5c0edc4f2ca0f466fcdb20be4a47b8..4cd00673e887183f49075e5d3ba904de public abstract Fluid getFlowing(); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index ff6f7ab4c6b731dbc49caf970caad330e1db71aa..e18f69be2311c4ce6300c8651e5230b0e2a6141d 100644 +index a61e8f71bc64f685e075578b519c0bb79d5f4d21..c9c8aca9210530fde712b0735b0f19347c82975c 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -449,6 +449,15 @@ public final class LeavesConfig { diff --git a/patches/server/0056-MC-Technical-Survival-Mode.patch b/patches/server/0055-MC-Technical-Survival-Mode.patch similarity index 98% rename from patches/server/0056-MC-Technical-Survival-Mode.patch rename to patches/server/0055-MC-Technical-Survival-Mode.patch index f2e635cc..c94202e0 100644 --- a/patches/server/0056-MC-Technical-Survival-Mode.patch +++ b/patches/server/0055-MC-Technical-Survival-Mode.patch @@ -133,7 +133,7 @@ index 1a239af1c3fc254927979752d2ee18e780d17dab..21034930f28f8bcba9dedf3733cd1eab // Paper end } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index c9c8aca9210530fde712b0735b0f19347c82975c..28a1ad9e6cb8fe4672d2fcdf67ad22a341012dce 100644 +index c9c8aca9210530fde712b0735b0f19347c82975c..03453da5a4746cd19ce89c621cdc157508efbec9 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -2,11 +2,13 @@ package top.leavesmc.leaves; @@ -150,7 +150,7 @@ index c9c8aca9210530fde712b0735b0f19347c82975c..28a1ad9e6cb8fe4672d2fcdf67ad22a3 import top.leavesmc.leaves.bot.BotCommand; import top.leavesmc.leaves.bot.agent.Actions; import top.leavesmc.leaves.util.MathUtils; -@@ -458,6 +460,22 @@ public final class LeavesConfig { +@@ -458,6 +460,23 @@ public final class LeavesConfig { } } @@ -167,6 +167,7 @@ index c9c8aca9210530fde712b0735b0f19347c82975c..28a1ad9e6cb8fe4672d2fcdf67ad22a3 + GlobalConfiguration.get().unsupportedSettings.allowPermanentBlockBreakExploits = true; + GlobalConfiguration.get().packetLimiter.allPackets = new GlobalConfiguration.PacketLimiter.PacketLimit(GlobalConfiguration.get().packetLimiter.allPackets.interval(), + 5000.0, GlobalConfiguration.get().packetLimiter.allPackets.action()); ++ GlobalConfiguration.get().unsupportedSettings.allowGrindstoneOverstacking = true; + } + } + diff --git a/patches/server/0057-Return-nether-portal-fix.patch b/patches/server/0056-Return-nether-portal-fix.patch similarity index 98% rename from patches/server/0057-Return-nether-portal-fix.patch rename to patches/server/0056-Return-nether-portal-fix.patch index 9e977ec1..16eb8131 100644 --- a/patches/server/0057-Return-nether-portal-fix.patch +++ b/patches/server/0056-Return-nether-portal-fix.patch @@ -74,7 +74,7 @@ index fb3f205ca2d462e492ca74218a69c5b9923dfdbb..372beee61e982998a255a69ae1958ff0 return optional; } else { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 428eb52ba1e8055e27e9154c7f39977d914d7be0..9bd0c11901aa88e9bf5a036711647e1131d995fa 100644 +index 6f991cab06ef7049fc0db02e6998d513e78b993d..d7a21346ecfe4d7a7e4df14346659826bdbc07b1 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -27,6 +27,8 @@ import java.util.UUID; @@ -133,10 +133,10 @@ index 7647b8bb3117d005dd616b29e7310f8328973b7f..eaeac639924098b86da57e2a87efc2af @Nullable private DamageSource lastDamageSource; diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index fdca60bb67c1ab574b3623ea83872608ade6951f..0fe63c9af69ed86561d22eac293a62fbb6f34e43 100644 +index 03453da5a4746cd19ce89c621cdc157508efbec9..a6f3c857c36f910791fab246be7f661d469e8109 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -476,6 +476,11 @@ public final class LeavesConfig { +@@ -477,6 +477,11 @@ public final class LeavesConfig { } } diff --git a/patches/server/0058-Appleskin-Protocol.patch b/patches/server/0057-Appleskin-Protocol.patch similarity index 97% rename from patches/server/0058-Appleskin-Protocol.patch rename to patches/server/0057-Appleskin-Protocol.patch index ad2f596c..e07a8517 100644 --- a/patches/server/0058-Appleskin-Protocol.patch +++ b/patches/server/0057-Appleskin-Protocol.patch @@ -17,7 +17,7 @@ index f6bc15c331f22aba5cbb41261dbc10a4dc1e2a8d..a611b34058c79383db1be22e9f755e36 MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper for (int i = 0; i < this.tickables.size(); ++i) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9bd0c11901aa88e9bf5a036711647e1131d995fa..67c6d95e81f0df600916d797af4af552d6e77604 100644 +index d7a21346ecfe4d7a7e4df14346659826bdbc07b1..ebf9894e216b8f30ded5134c683ad68efd9c4ccd 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -340,6 +340,7 @@ public abstract class PlayerList { @@ -55,10 +55,10 @@ index b69f915226dd9cda4b5f24e307d89c19e739ab8b..1febe4e731356f9470020048bf78b1eb // 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)) diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 0fe63c9af69ed86561d22eac293a62fbb6f34e43..25b19e288eb7d2dcf00bbfed98c69591901ec9cf 100644 +index a6f3c857c36f910791fab246be7f661d469e8109..8b242374ac5189835bfb86e61bd5c252d45353b5 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -481,6 +481,11 @@ public final class LeavesConfig { +@@ -482,6 +482,11 @@ public final class LeavesConfig { netherPortalFix = getBoolean("settings.modify.return-nether-portal-fix", netherPortalFix); } diff --git a/patches/server/0059-Xaero-Map-Protocol.patch b/patches/server/0058-Xaero-Map-Protocol.patch similarity index 96% rename from patches/server/0059-Xaero-Map-Protocol.patch rename to patches/server/0058-Xaero-Map-Protocol.patch index 0c548379..931f8f76 100644 --- a/patches/server/0059-Xaero-Map-Protocol.patch +++ b/patches/server/0058-Xaero-Map-Protocol.patch @@ -17,7 +17,7 @@ index ebf9894e216b8f30ded5134c683ad68efd9c4ccd..e485b48158d65b4d47da83226f3a4ebe // CraftBukkit start - handle player weather // entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F)); diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index c9ec11d4ce7c647ee48da25e080a0866f2431b94..12eb83b2c259e19f771583e34795132638c86f85 100644 +index 8b242374ac5189835bfb86e61bd5c252d45353b5..16cd3bbb3c99c87286e580440c17173183b408fa 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -20,6 +20,7 @@ import java.lang.reflect.Modifier; @@ -28,7 +28,7 @@ index c9ec11d4ce7c647ee48da25e080a0866f2431b94..12eb83b2c259e19f771583e347951326 import java.util.logging.Level; // Powered by Tuinity(https://github.com/Tuinity/Tuinity) -@@ -486,6 +487,13 @@ public final class LeavesConfig { +@@ -487,6 +488,13 @@ public final class LeavesConfig { appleskinProtocol = getBoolean("settings.protocol.appleskin-protocol", appleskinProtocol); }