Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-23 17:09:26 +00:00
Code Issues Releases Activity

Fakeplayer skip sleep check config (#34)

Browse Source
This commit is contained in:
violetc
2023-05-18 22:20:00 +08:00
parent e9ef6affbe
commit 1cc8ae8611
52 changed files with 112 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0009-Fakeplayer-support.patch
View File

@@ -260,7 +260,7 @@ index 57a0dbb23a32123d30c3b3572f4d129be9d97847..deb7057a684b81741edb9f0903cda043
}
// Water Animals
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 1fb25e8a21b568864974cc81b452ba062890d593..67337e7daefec0fa710ea0df0e8cfeb81d957972 100644
index 1fb25e8a21b568864974cc81b452ba062890d593..816d78268db3d0be0a70ff3c78e74b520f9b525e 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -7,6 +7,8 @@ import org.bukkit.Bukkit;
@@ -310,7 +310,7 @@ index 1fb25e8a21b568864974cc81b452ba062890d593..67337e7daefec0fa710ea0df0e8cfeb8
public static boolean playerCanEditSign = true;
private static void playerCanEditSign() {
playerCanEditSign = getBoolean("settings.modify.player-can-edit-sign", playerCanEditSign);
@@ -146,6 +162,25 @@ public final class LeavesConfig {
@@ -146,6 +162,27 @@ public final class LeavesConfig {
snowballAndEggCanKnockback = getBoolean("settings.modify.snowball-and-egg-can-knockback-player", snowballAndEggCanKnockback);
}
@@ -322,6 +322,7 @@ index 1fb25e8a21b568864974cc81b452ba062890d593..67337e7daefec0fa710ea0df0e8cfeb8
+ public static boolean alwaysSendFakeplayerData = true;
+ public static boolean fakeplayerResident = false;
+ public static boolean openFakeplayerInventory = false;
+ public static boolean fakeplayerSkipSleep = false;
+ private static void fakeplayer() {
+ fakeplayerSupport = getBoolean("settings.modify.fakeplayer.enable", fakeplayerSupport);
+ unableFakeplayerNames = getList("settings.modify.fakeplayer.unable-fakeplayer-names", unableFakeplayerNames);
@@ -331,6 +332,7 @@ index 1fb25e8a21b568864974cc81b452ba062890d593..67337e7daefec0fa710ea0df0e8cfeb8
+ alwaysSendFakeplayerData = getBoolean("settings.modify.fakeplayer.always-send-data", alwaysSendFakeplayerData);
+ fakeplayerResident = getBoolean("settings.modify.fakeplayer.resident-fakeplayer", fakeplayerResident);
+ openFakeplayerInventory = getBoolean("settings.modify.fakeplayer.open-fakeplayer-inventory", openFakeplayerInventory);
+ fakeplayerSkipSleep = getBoolean("settings.modify.fakeplayer.skip-sleep-check", fakeplayerSkipSleep);
+ }
+
public static final class WorldConfig {
@@ -946,10 +948,10 @@ index 0000000000000000000000000000000000000000..d6466ee4db637106e1394bb462d875e5
+}
diff --git a/src/main/java/top/leavesmc/leaves/bot/ServerBot.java b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java
new file mode 100644
index 0000000000000000000000000000000000000000..548e4b77751e476fa25268f67768bb3dbe6c7a03
index 0000000000000000000000000000000000000000..8208efc49c9d6e3395a5ca00995da343e57fa215
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java
@@ -0,0 +1,781 @@
@@ -0,0 +1,782 @@
+package top.leavesmc.leaves.bot;
+
+import com.google.common.collect.Lists;
@@ -1080,6 +1082,7 @@ index 0000000000000000000000000000000000000000..548e4b77751e476fa25268f67768bb3d
+ this.skinName = skinName;
+ this.container = new BotInventoryContainer(this);
+ server.getPlayerList().addNewBot(this);
+ this.fauxSleeping = LeavesConfig.fakeplayerSkipSleep;
+ }
+
+ public static void createBot(Location loc, String name, String skinName) {

6
patches/server/0010-Make-shears-in-dispenser-can-unlimited-use.patch
View File

@@ -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 67337e7daefec0fa710ea0df0e8cfeb81d957972..bfef6cd885d538f831a481c7a22e12ede149a29a 100644
index 816d78268db3d0be0a70ff3c78e74b520f9b525e..875e4842274388c098e36b1ec0b9c6d69389646b 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 {
@@ -34,8 +34,8 @@ index 67337e7daefec0fa710ea0df0e8cfeb81d957972..bfef6cd885d538f831a481c7a22e12ed
}
}
@@ -181,6 +183,11 @@ public final class LeavesConfig {
openFakeplayerInventory = getBoolean("settings.modify.fakeplayer.open-fakeplayer-inventory", openFakeplayerInventory);
@@ -183,6 +185,11 @@ public final class LeavesConfig {
fakeplayerSkipSleep = getBoolean("settings.modify.fakeplayer.skip-sleep-check", fakeplayerSkipSleep);
}
+ public static boolean shearsInDispenserCanZeroAmount = false;

4
patches/server/0011-Redstone-Shears-Wrench.patch
View File

@@ -99,7 +99,7 @@ index a6ebb08a8f9681fd3a35de5d0e268f320e31ce1a..7c3c3a28a95c58caa83e283cdbb472b2
+ // 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 bfef6cd885d538f831a481c7a22e12ede149a29a..e89efa1a5828ce2b97b99ab8dc22f16d74ca899a 100644
index 875e4842274388c098e36b1ec0b9c6d69389646b..c763ad196bb736b84dc76678267af4a91090ea30 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 {
@@ -116,7 +116,7 @@ index bfef6cd885d538f831a481c7a22e12ede149a29a..e89efa1a5828ce2b97b99ab8dc22f16d
}
}
@@ -188,6 +190,11 @@ public final class LeavesConfig {
@@ -190,6 +192,11 @@ public final class LeavesConfig {
shearsInDispenserCanZeroAmount = getBoolean("settings.modify.shears-in-dispenser-can-zero-amount", shearsInDispenserCanZeroAmount);
}

4
patches/server/0013-Budding-Amethyst-can-push-by-piston.patch
View File

@@ -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 e89efa1a5828ce2b97b99ab8dc22f16d74ca899a..049864517e9cd95d1d5aba17d3f90b71a4685b14 100644
index c763ad196bb736b84dc76678267af4a91090ea30..5deb90e39bbdf722f63be6abdad28aca46cb1458 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 {
@@ -39,7 +39,7 @@ index e89efa1a5828ce2b97b99ab8dc22f16d74ca899a..049864517e9cd95d1d5aba17d3f90b71
}
}
@@ -195,6 +197,11 @@ public final class LeavesConfig {
@@ -197,6 +199,11 @@ public final class LeavesConfig {
redstoneShearsWrench = getBoolean("settings.modify.redstone-shears-wrench", redstoneShearsWrench);
}

4
patches/server/0014-Spectator-dont-get-Advancement.patch
View File

@@ -29,7 +29,7 @@ index a1ce0cce055ad5c92b0f20760471795f08f0c886..6a5025e54c4bf4396f1f18a81d9db912
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 049864517e9cd95d1d5aba17d3f90b71a4685b14..4f7c6d8633a7cb75e61932ac02a74e06d0c2da70 100644
index 5deb90e39bbdf722f63be6abdad28aca46cb1458..6ef5bae104cff51ada4efc631b93067067c71941 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 {
@@ -48,7 +48,7 @@ index 049864517e9cd95d1d5aba17d3f90b71a4685b14..4f7c6d8633a7cb75e61932ac02a74e06
}
}
@@ -201,6 +203,11 @@ public final class LeavesConfig {
@@ -203,6 +205,11 @@ public final class LeavesConfig {
private static void buddingAmethystCanPushByPiston() {
buddingAmethystCanPushByPiston = getBoolean("settings.modify.budding-amethyst-can-push-by-piston", buddingAmethystCanPushByPiston);
}

4
patches/server/0015-Stick-can-change-ArmorStand-arm-status.patch
View File

@@ -22,7 +22,7 @@ index 3677dd991ae73428984e62e4d6fb757317987887..3b488949ba5cd7465e4de3955e5430fc
return InteractionResult.FAIL;
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 4f7c6d8633a7cb75e61932ac02a74e06d0c2da70..adee0164aaa55ebdef2281d8e46682da1ac88278 100644
index 6ef5bae104cff51ada4efc631b93067067c71941..6fc915534c172cc7d2b9eea806b23f54018b78ce 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 {
@@ -41,7 +41,7 @@ index 4f7c6d8633a7cb75e61932ac02a74e06d0c2da70..adee0164aaa55ebdef2281d8e46682da
}
}
@@ -208,6 +210,11 @@ public final class LeavesConfig {
@@ -210,6 +212,11 @@ public final class LeavesConfig {
private static void spectatorDontGetAdvancement() {
spectatorDontGetAdvancement = getBoolean("settings.modify.spectator-dont-get-advancement", spectatorDontGetAdvancement);
}

4
patches/server/0017-No-chat-sign.patch
View File

@@ -168,7 +168,7 @@ index 18fde115b543f6db866779f20f363fab8d569dd6..4b01d4e247936b56cc4a833002ee081f
// CraftBukkit start
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index adee0164aaa55ebdef2281d8e46682da1ac88278..937e84214223e978b3b6bc6107974c61e2d0f558 100644
index 6fc915534c172cc7d2b9eea806b23f54018b78ce..ce3c88c1cdb58f63aecc87b9900f8cf7c6144908 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 {
@@ -187,7 +187,7 @@ index adee0164aaa55ebdef2281d8e46682da1ac88278..937e84214223e978b3b6bc6107974c61
}
}
@@ -215,6 +217,15 @@ public final class LeavesConfig {
@@ -217,6 +219,15 @@ public final class LeavesConfig {
private static void stickChangeArmorStandHasArm() {
stickChangeArmorStandArmStatus = getBoolean("settings.modify.stick-change-armorstand-arm-status", stickChangeArmorStandArmStatus);
}

4
patches/server/0018-Optimize-mob-spawning.patch
View File

@@ -19,10 +19,10 @@ index 15d266fc97eb73338f4f6fb2cfe25d6861e79810..70773c525bcf33d4d4764ce4a16deddd
// CraftBukkit end
Objects.requireNonNull(info);
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 937e84214223e978b3b6bc6107974c61e2d0f558..af84cbaf93392d90b4c74ef5a0eb7bd163b76ce5 100644
index ce3c88c1cdb58f63aecc87b9900f8cf7c6144908..dfce8514d0ea36d24bd4168856d6f10f68f4e30c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -226,7 +226,21 @@ public final class LeavesConfig {
@@ -228,7 +228,21 @@ public final class LeavesConfig {
}
noChatSign = getBoolean("settings.misc.no-chat-sign", noChatSign);
}

4
patches/server/0019-Dont-send-useless-entity-packets.patch
View File

@@ -52,10 +52,10 @@ index b7fd8e70413c38923d0719aff803449e392383ac..209685e67ebdb7f062bb58118242dcbf
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 af84cbaf93392d90b4c74ef5a0eb7bd163b76ce5..d217994b16f2f749fe48fe0b895416e0ae02eee4 100644
index dfce8514d0ea36d24bd4168856d6f10f68f4e30c..dc9164ecabd5d17020bbd8597a78aac1dce7c362 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -241,6 +241,11 @@ public final class LeavesConfig {
@@ -243,6 +243,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0020-Multithreaded-Tracker.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Multithreaded Tracker
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index d217994b16f2f749fe48fe0b895416e0ae02eee4..46233c5845cffb67d89f360c4dfdcc80abdf00c8 100644
index dc9164ecabd5d17020bbd8597a78aac1dce7c362..4abc997fbe641f9c97b31fb88314230f7eb9af04 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -246,6 +246,20 @@ public final class LeavesConfig {
@@ -248,6 +248,20 @@ public final class LeavesConfig {
dontSendUselessEntityPackets = getBoolean("settings.performance.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
}

4
patches/server/0021-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch
View File

@@ -18,10 +18,10 @@ 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 46233c5845cffb67d89f360c4dfdcc80abdf00c8..549cfa4766d8ad9c78b18d86cbdac22a558a727b 100644
index 4abc997fbe641f9c97b31fb88314230f7eb9af04..b2e135eac3c1bc7c9486a9e38f162bd3b68c24bb 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -260,6 +260,11 @@ public final class LeavesConfig {
@@ -262,6 +262,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0022-Optimize-entity-coordinate-key.patch
View File

@@ -38,10 +38,10 @@ index a5842db77bdba6061e0bdd8a7118d93e16d9f793..14dc0a75043274bf0ff31f4982ca7224
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 549cfa4766d8ad9c78b18d86cbdac22a558a727b..b6bd8381f34bac1d88ea73da5284a65668093b56 100644
index b2e135eac3c1bc7c9486a9e38f162bd3b68c24bb..a3790fb532642a3dd5f0f31503733279a86ed20e 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -265,6 +265,12 @@ public final class LeavesConfig {
@@ -267,6 +267,12 @@ public final class LeavesConfig {
fixPaper6045 = getBoolean("settings.performance.fix.fix-paper-6045", fixPaper6045);
}

4
patches/server/0023-Optimize-suffocation.patch
View File

@@ -35,10 +35,10 @@ index bf41a901ed274fd2f5e8c861301f395825b50167..f0579a29fb4fa51aa9db8f9467f63926
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 b6bd8381f34bac1d88ea73da5284a65668093b56..c88049b0223d90bd6bdc2eab433e78e9411280d5 100644
index a3790fb532642a3dd5f0f31503733279a86ed20e..a4413e18f98c008bc4456af4349041294f90b22c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -270,6 +270,10 @@ public final class LeavesConfig {
@@ -272,6 +272,10 @@ public final class LeavesConfig {
optimizeEntityCoordinateKey = getBoolean("settings.performance.optimize-entity-coordinate-key", optimizeEntityCoordinateKey);
}

4
patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
View File

@@ -142,10 +142,10 @@ index 31f0034115a88a42b18e0b838eab8b801473bbef..8cadc9655b8876ede4ec4d2b09198445
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 c88049b0223d90bd6bdc2eab433e78e9411280d5..88969f50419f7966d395d4fd3f42ce3cb9dd9581 100644
index a4413e18f98c008bc4456af4349041294f90b22c..6a0cade17ef3ee3aae50e9c2f174ebd631b8bd73 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -275,6 +275,11 @@ public final class LeavesConfig {
@@ -277,6 +277,11 @@ public final class LeavesConfig {
enableSuffocationOptimization = getBoolean("settings.performance.enable-suffocation-optimization", enableSuffocationOptimization);
}

4
patches/server/0025-Only-check-for-spooky-season-once-an-hour.patch
View File

@@ -45,10 +45,10 @@ index f5efdf59617d43de18a2267351fa784c0be3ae83..3af66e566c7e154eda362a564c630b5c
@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 88969f50419f7966d395d4fd3f42ce3cb9dd9581..b34de11a113b4b3943c0f3cea7036a80ac4e4bd9 100644
index 6a0cade17ef3ee3aae50e9c2f174ebd631b8bd73..be15c7782599d957a75917a949837b043040b4be 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -280,6 +280,11 @@ public final class LeavesConfig {
@@ -282,6 +282,11 @@ public final class LeavesConfig {
entityStripRaytracing = getBoolean("settings.performance.strip-raytracing-for-entity", entityStripRaytracing);
}

4
patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch
View File

@@ -94,10 +94,10 @@ index d190bad5d287766ed4165ed827d9901a9d878687..19012c60ea6f725248f7e4a18d78eb10
// CraftBukkit start
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index b34de11a113b4b3943c0f3cea7036a80ac4e4bd9..4acebe3a5eeef435415ba8c44e7c04ba21751c69 100644
index be15c7782599d957a75917a949837b043040b4be..e31eb5b9d67c2a03a63dc4c604460171da727544 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -285,6 +285,15 @@ public final class LeavesConfig {
@@ -287,6 +287,15 @@ public final class LeavesConfig {
checkSpookySeasonOnceAnHour = getBoolean("settings.performance.check-spooky-season-once-an-hour", checkSpookySeasonOnceAnHour);
}

4
patches/server/0028-Skip-POI-finding-if-stuck-in-vehicle.patch
View File

@@ -22,10 +22,10 @@ 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 4acebe3a5eeef435415ba8c44e7c04ba21751c69..93bc4c20785b235cb22099ed160ef1f32290fe85 100644
index e31eb5b9d67c2a03a63dc4c604460171da727544..dbe16bd59963bba79f39ba739adb759687f21874 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -294,6 +294,11 @@ public final class LeavesConfig {
@@ -296,6 +296,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0029-Early-return-optimization-for-target-finding.patch
View File

@@ -29,10 +29,10 @@ 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 93bc4c20785b235cb22099ed160ef1f32290fe85..cefea848344060836cddea81e16e7b5613c54fb7 100644
index dbe16bd59963bba79f39ba739adb759687f21874..d7ab1518c81bc37c76e39cece2dc81d17cb1ef15 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 {
@@ -300,6 +300,11 @@ public final class LeavesConfig {
private static void skipPOIFindingInVehicle() {
skipPOIFindingInVehicle = getBoolean("settings.performance.skip-poi-find-in-vehicle", skipPOIFindingInVehicle);
}

4
patches/server/0030-Use-thread-unsafe-random-for-mob-spawning.patch
View File

@@ -38,10 +38,10 @@ index 70773c525bcf33d4d4764ce4a16dedddc423b02b..7a3bd3e7aa208ade1d33f59ba684354d
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 cefea848344060836cddea81e16e7b5613c54fb7..c81a7a41ae4ff73608150ac92197525b46a19212 100644
index d7ab1518c81bc37c76e39cece2dc81d17cb1ef15..b41c9504a1c09c239b8e8a12efe6e63f9dfc591f 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -304,6 +304,11 @@ public final class LeavesConfig {
@@ -306,6 +306,11 @@ public final class LeavesConfig {
entityTargetFindingOptimization = getBoolean("settings.performance.entity-target-find-optimization", entityTargetFindingOptimization);
}

4
patches/server/0031-Config-to-disable-method-profiler.patch
View File

@@ -38,10 +38,10 @@ index 844ebd772c1c0b9856069356e451084a1b771324..847d1cb27da0ee06f208acec93ee6758
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index c81a7a41ae4ff73608150ac92197525b46a19212..564310e0cf4ddcfe502f2b2ed923096beb7eba00 100644
index b41c9504a1c09c239b8e8a12efe6e63f9dfc591f..ceb2432d4271beb82f260e52b54d5661f992927c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -309,6 +309,11 @@ public final class LeavesConfig {
@@ -311,6 +311,11 @@ public final class LeavesConfig {
useMoreThreadUnsafeRandom = getBoolean("settings.performance.use-more-thread-unsafe-random", useMoreThreadUnsafeRandom);
}

4
patches/server/0032-Throttle-goal-selector-during-inactive-ticking.patch
View File

@@ -25,10 +25,10 @@ index 02cb6b8c1d59855ff4a8aad3024fe12007eca0ee..0ba8fdb035e65bd590079a3bcb8d35a1
}
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 564310e0cf4ddcfe502f2b2ed923096beb7eba00..93b70e8149d98b0d29729687d66d17bf898685be 100644
index ceb2432d4271beb82f260e52b54d5661f992927c..53ccd141c53faa3fa53127f546ba0faeb685d731 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -314,6 +314,11 @@ public final class LeavesConfig {
@@ -316,6 +316,11 @@ public final class LeavesConfig {
disableMethodProfiler = getBoolean("settings.misc.disable-method-profiler", disableMethodProfiler);
}

4
patches/server/0033-Skip-cloning-loot-parameters.patch
View File

@@ -28,10 +28,10 @@ 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 93b70e8149d98b0d29729687d66d17bf898685be..bbc402ea7addd33b6d77b51c213bd8b29615caea 100644
index 53ccd141c53faa3fa53127f546ba0faeb685d731..1335959fc27da3e53ea845dff83fcac0b3a1e873 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -319,6 +319,11 @@ public final class LeavesConfig {
@@ -321,6 +321,11 @@ public final class LeavesConfig {
throttleInactiveGoalSelectorTick = getBoolean("settings.performance.inactive-goal-selector-disable", throttleInactiveGoalSelectorTick);
}

4
patches/server/0034-Reduce-entity-allocations.patch
View File

@@ -54,10 +54,10 @@ 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 bbc402ea7addd33b6d77b51c213bd8b29615caea..dedf8d67dcf389c98b67614fc75b69465c18d276 100644
index 1335959fc27da3e53ea845dff83fcac0b3a1e873..6227a02006c98fe93f500f2a192aec0ff77a8187 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -324,6 +324,11 @@ public final class LeavesConfig {
@@ -326,6 +326,11 @@ public final class LeavesConfig {
skipCloneLootParameters = getBoolean("settings.performance.skip-clone-loot-parameters", skipCloneLootParameters);
}

4
patches/server/0035-Remove-lambda-from-ticking-guard.patch
View File

@@ -36,10 +36,10 @@ index b06a79cbf4ab0fe3ff6f2f9a2d4697e6bf237d60..b0a30f6426868b397ae73d20d57e0c3d
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index dedf8d67dcf389c98b67614fc75b69465c18d276..83a3d5b3324ad49c0a9e203037a793c03fb3bcfc 100644
index 6227a02006c98fe93f500f2a192aec0ff77a8187..205b7b98271208457d8acc434d1f8b2bd804dd4c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -329,6 +329,11 @@ public final class LeavesConfig {
@@ -331,6 +331,11 @@ public final class LeavesConfig {
reduceEntityAllocations = getBoolean("settings.performance.reduce-entity-allocations", reduceEntityAllocations);
}

4
patches/server/0036-Remove-iterators-from-inventory-contains.patch
View File

@@ -55,10 +55,10 @@ index 27c028ab6b1edb6e413af3bbaa27bf30f2d85540..4a89ce4fbd8b19ce1cff5905d779d2e4
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 83a3d5b3324ad49c0a9e203037a793c03fb3bcfc..d29d1dfcd3b5cf3c74e377acaf64186b03cf7b4a 100644
index 205b7b98271208457d8acc434d1f8b2bd804dd4c..6377b8ca3cafcbb1b63fc713cc8e132e2260233d 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -334,6 +334,11 @@ public final class LeavesConfig {
@@ -336,6 +336,11 @@ public final class LeavesConfig {
removeTickGuardLambda = getBoolean("settings.performance.remove.tick-guard-lambda", removeTickGuardLambda);
}

4
patches/server/0037-Remove-streams-from-getting-nearby-players.patch
View File

@@ -68,10 +68,10 @@ index 9f5b14295f85d32a8ebee44b3aab939cb7ea6230..cf1694ada40fab9e06f702bcf6bf3a6a
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 d29d1dfcd3b5cf3c74e377acaf64186b03cf7b4a..37b6a53b8b6f09af4f8e389eb6afdb80b6494554 100644
index 6377b8ca3cafcbb1b63fc713cc8e132e2260233d..14d04bd5e7421fa11a1e2e55394fef99ed66235e 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -339,6 +339,11 @@ public final class LeavesConfig {
@@ -341,6 +341,11 @@ public final class LeavesConfig {
removeInventoryContainsIterators = getBoolean("settings.performance.remove.inventory-contains-iterators", removeInventoryContainsIterators);
}

4
patches/server/0038-Remove-streams-and-iterators-from-range-check.patch
View File

@@ -63,10 +63,10 @@ index fbe209a66c77c47935ad026dd3e45e682af91fd8..71d62db53b5b103c3640e1f77609445b
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 37b6a53b8b6f09af4f8e389eb6afdb80b6494554..91087dc6d9429f0ccca1194bcf25f52bd264febb 100644
index 14d04bd5e7421fa11a1e2e55394fef99ed66235e..b75cd13ae7a7d961333d712235baa160ae392b4c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -344,6 +344,11 @@ public final class LeavesConfig {
@@ -346,6 +346,11 @@ public final class LeavesConfig {
removeGetNearPlayerStreams = getBoolean("settings.performance.remove.get-nearby-players-streams", removeGetNearPlayerStreams);
}

4
patches/server/0039-Async-Pathfinding.patch
View File

@@ -7,10 +7,10 @@ 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 91087dc6d9429f0ccca1194bcf25f52bd264febb..cf3de827f8a2f1a48546e17327e71d1fa5b7058a 100644
index b75cd13ae7a7d961333d712235baa160ae392b4c..a11466aaffe55aa86b54a4aa31586f446e31e0df 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -349,6 +349,21 @@ public final class LeavesConfig {
@@ -351,6 +351,21 @@ public final class LeavesConfig {
removeRangeCheckStreams = getBoolean("settings.performance.remove.range-check-streams-and-iterators", removeRangeCheckStreams);
}

4
patches/server/0040-Cache-climbing-check-for-activation.patch
View File

@@ -46,10 +46,10 @@ index 52780192d6417f8085566e4cdf3a895a83638520..eeb3522c39dde84e497d22758e90b42f
return 1; // Paper
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index cf3de827f8a2f1a48546e17327e71d1fa5b7058a..c0e405bae8dfadfef5295240f6cebd0670fbdaae 100644
index a11466aaffe55aa86b54a4aa31586f446e31e0df..d6cd39d61c87636cb4c3500d5a303d3bb28c45fa 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -364,6 +364,11 @@ public final class LeavesConfig {
@@ -366,6 +366,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0041-Use-aging-cache-for-biome-temperatures.patch
View File

@@ -102,10 +102,10 @@ index 65012a12e1430956ef55ced56773e6354ac26444..fe43432da26a3570c993b5592b7b8020
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 c0e405bae8dfadfef5295240f6cebd0670fbdaae..58a00110efb035bd893f89ab24f353d0427a6888 100644
index d6cd39d61c87636cb4c3500d5a303d3bb28c45fa..21d23b2c3691f52aac9445e3c2ceb29eb7970d2b 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -369,6 +369,15 @@ public final class LeavesConfig {
@@ -371,6 +371,15 @@ public final class LeavesConfig {
cacheClimbCheck = getBoolean("settings.performance.cache-climb-check", cacheClimbCheck);
}

4
patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -217,10 +217,10 @@ index 1b80a91fa36c59a31b57ef7ef4a68eacbb0f17f5..62f4e7a2dcd93a5b11fb9f847c70da1b
});
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 58a00110efb035bd893f89ab24f353d0427a6888..81763862b3e12797038920ff55b96325927049e2 100644
index 21d23b2c3691f52aac9445e3c2ceb29eb7970d2b..1b82f85e4655ca0edc90026582b89b40e0438bf6 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -378,6 +378,11 @@ public final class LeavesConfig {
@@ -380,6 +380,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0043-Reduce-chunk-loading-lookups.patch
View File

@@ -42,10 +42,10 @@ index 418d6301f067803e2471e59ac2d52a68cbff249b..5659e7e61bc3ab36817d17e95a758696
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 81763862b3e12797038920ff55b96325927049e2..54195078dcf4ad069bb21cd73c85509eafb85630 100644
index 1b82f85e4655ca0edc90026582b89b40e0438bf6..b6282e09aff5cc7f8db682faff92d2b2e8b0f47a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -383,6 +383,11 @@ public final class LeavesConfig {
@@ -385,6 +385,11 @@ public final class LeavesConfig {
reduceEntityFluidLookup = getBoolean("settings.performance.reduce-entity-fluid-lookup", reduceEntityFluidLookup);
}

4
patches/server/0044-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch
View File

@@ -73,10 +73,10 @@ index f7ea77dd82d978ad307f99c743efacfb34478b3d..96be7a7b030b2f82ac91f0c5c8e66f28
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 54195078dcf4ad069bb21cd73c85509eafb85630..ef298d46639f042780154855aca01e69257ba708 100644
index b6282e09aff5cc7f8db682faff92d2b2e8b0f47a..0765f80c16efcc17e7b2dc5bf08a1a92eeddb1ae 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -388,6 +388,11 @@ public final class LeavesConfig {
@@ -390,6 +390,11 @@ public final class LeavesConfig {
reduceChuckLoadAndLookup = getBoolean("settings.performance.reduce-chuck-load-and-lookup", reduceChuckLoadAndLookup);
}

4
patches/server/0045-PCA-sync-protocol.patch
View File

@@ -369,10 +369,10 @@ index d6e2c67650341f823f08c07c3eb576530959338d..7f2602056b595ab7435defb9ddfb6688
// 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 ef298d46639f042780154855aca01e69257ba708..77595ddd8569251f4481d3dddbd769710c69320a 100644
index 0765f80c16efcc17e7b2dc5bf08a1a92eeddb1ae..3d71b6cfcb8e7b87b3549aa60dabb4491abbc41a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -393,6 +393,21 @@ public final class LeavesConfig {
@@ -395,6 +395,21 @@ public final class LeavesConfig {
simplerVanillaShapelessRecipes = getBoolean("settings.performance.simpler-vanilla-shapeless-recipes", simplerVanillaShapelessRecipes);
}

4
patches/server/0046-BBOR-Protocol.patch
View File

@@ -95,10 +95,10 @@ index 7f2602056b595ab7435defb9ddfb66889ad5f08d..14553aaea6224fe7e6461c64d1ba2b0d
// 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 77595ddd8569251f4481d3dddbd769710c69320a..45dfb5b52b7d8bd70463330d393ce04b89f9e1db 100644
index 3d71b6cfcb8e7b87b3549aa60dabb4491abbc41a..1a05745fa952664a937cd2b85e62cbbdb0215ed1 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -408,6 +408,11 @@ public final class LeavesConfig {
@@ -410,6 +410,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0047-InstantBlockUpdater-Reintroduced.patch
View File

@@ -33,10 +33,10 @@ index 847d1cb27da0ee06f208acec93ee6758ae04d6f9..53de57db1ee31761598bcaed5682d1b5
this.damageSources = new DamageSources(iregistrycustom);
// CraftBukkit start
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 45dfb5b52b7d8bd70463330d393ce04b89f9e1db..9e51213a50a7638ae0c4f3e52acc73521ce14d9f 100644
index 1a05745fa952664a937cd2b85e62cbbdb0215ed1..bd446ec62a1b2b87d8e3c49273852eb0d560e934 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -413,6 +413,15 @@ public final class LeavesConfig {
@@ -415,6 +415,15 @@ public final class LeavesConfig {
bborProtocol = getBoolean("settings.protocol.bbor-protocol", bborProtocol);
}

4
patches/server/0048-Random-flatten-triangular-distribution.patch
View File

@@ -26,10 +26,10 @@ 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 9e51213a50a7638ae0c4f3e52acc73521ce14d9f..21d121fceea62d9df6910a614814236eadb69da7 100644
index bd446ec62a1b2b87d8e3c49273852eb0d560e934..68fb787c2356b7e699c6df9c856362009d42a9bb 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -422,6 +422,11 @@ public final class LeavesConfig {
@@ -424,6 +424,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0049-Jade-Protocol.patch
View File

@@ -69,10 +69,10 @@ index 14553aaea6224fe7e6461c64d1ba2b0d427d0cda..640bf562bc2b29bbba5375eea5bc4714
// 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 21d121fceea62d9df6910a614814236eadb69da7..dc08bb22abba5b050200d94a834dac7d25e2c69d 100644
index 68fb787c2356b7e699c6df9c856362009d42a9bb..696d290df17274b7e82b2d12ea2c16b28173f660 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -427,6 +427,11 @@ public final class LeavesConfig {
@@ -429,6 +429,11 @@ public final class LeavesConfig {
flattenTriangularDistribution = getBoolean("settings.modify.flatten-triangular-distribution", flattenTriangularDistribution);
}

4
patches/server/0050-Carpet-alternative-block-placement-Protocol.patch
View File

@@ -78,10 +78,10 @@ index 4f91e4832a94c3facbc711fcae4cb5ad540a5ca0..08e456ee6a537c5cc8b6314f9f899b25
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 dc08bb22abba5b050200d94a834dac7d25e2c69d..378f70b47482ee8b619d6e8685579018e5466db9 100644
index 696d290df17274b7e82b2d12ea2c16b28173f660..be07458a96a0e7da995ce349a70be9f1b648da23 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -432,6 +432,15 @@ public final class LeavesConfig {
@@ -434,6 +434,15 @@ public final class LeavesConfig {
jadeProtocol = getBoolean("settings.protocol.jade-protocol", jadeProtocol);
}

6
patches/server/0051-Player-operation-limiter.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0043261e4fc1c7de6281b9b150f71aa9c2494aa1..741ec2c1be0661f503e246d1c16b3ac97b1fa2e4 100644
index fa1125c32f601e67fa3f9a1912b430cf975a1af8..6d2c2a73fe06c4b45ccc43a2702539ec824b2989 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -276,6 +276,10 @@ public class ServerPlayer extends Player {
@@ -132,10 +132,10 @@ index 1015b3c5f6969709bb8ebfbd66eb9cede444385c..437ed8d4cba5e3393ac6370f6b8e364e
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 378f70b47482ee8b619d6e8685579018e5466db9..19c324a33ee43ecb9ddeeafa9e4fa0628b540cf6 100644
index be07458a96a0e7da995ce349a70be9f1b648da23..dbcc4046b447ef6d5f22948552cc54afd9d1b6f5 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -441,6 +441,11 @@ public final class LeavesConfig {
@@ -443,6 +443,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0052-Renewable-Elytra.patch
View File

@@ -40,10 +40,10 @@ index 97fb1d2110a51498f6419841081b500b3f190370..8fb8bc48342183b978b4bfb0845f2cc2
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 19c324a33ee43ecb9ddeeafa9e4fa0628b540cf6..c45fa09bf1d60416621310bf5865432f963ff1dd 100644
index dbcc4046b447ef6d5f22948552cc54afd9d1b6f5..760eb626aedf93b84e4ba0fbb05c85869f6131b1 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -446,6 +446,11 @@ public final class LeavesConfig {
@@ -448,6 +448,11 @@ public final class LeavesConfig {
playerOperationLimiter = getBoolean("settings.modify.player-operation-limiter", playerOperationLimiter);
}

4
patches/server/0053-Stackable-ShulkerBoxes.patch
View File

@@ -278,7 +278,7 @@ index 47468086c1cae252aa99c55b0065f225357dee62..bca757ea05403fe46f5bf0dfa75561b8
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
return SHAPE;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index c45fa09bf1d60416621310bf5865432f963ff1dd..10bb7126e0d02d0dabb2932a22beca80990f98a8 100644
index 760eb626aedf93b84e4ba0fbb05c85869f6131b1..2d75a91da7cea7e40f18fbb200c6507b3164f3de 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -9,6 +9,7 @@ import org.bukkit.configuration.ConfigurationSection;
@@ -289,7 +289,7 @@ index c45fa09bf1d60416621310bf5865432f963ff1dd..10bb7126e0d02d0dabb2932a22beca80
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@@ -451,6 +452,14 @@ public final class LeavesConfig {
@@ -453,6 +454,14 @@ public final class LeavesConfig {
renewableElytra = getDouble("settings.modify.renewable-elytra", renewableElytra);
}

4
patches/server/0054-Improve-fluid-direction-caching.patch
View File

@@ -117,10 +117,10 @@ index bf4de7b8fd630c596e096a411a8c84c64c13ebf7..72a1414efbcf62c888c3f4542985709c
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 10bb7126e0d02d0dabb2932a22beca80990f98a8..f99e5fef954ac4411a03daad2de6e0dcdd19a40f 100644
index 2d75a91da7cea7e40f18fbb200c6507b3164f3de..ecf0c849a514eaf63f13ebf5f5af70c7b84433ea 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -460,6 +460,15 @@ public final class LeavesConfig {
@@ -462,6 +462,15 @@ public final class LeavesConfig {
shulkerBoxStackSize = Integer.parseInt(stackableShulkerBoxes);
}

4
patches/server/0055-MC-Technical-Survival-Mode.patch
View File

@@ -70,7 +70,7 @@ index 7a3bd3e7aa208ade1d33f59ba684354d000dd011..164dd501456542c16e2e36262ba560f9
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 f99e5fef954ac4411a03daad2de6e0dcdd19a40f..5dd3cb5ff66242fca54a1a9aec9a3b1ff10ea0ab 100644
index ecf0c849a514eaf63f13ebf5f5af70c7b84433ea..01f2fcbdae8bfd3fcce13fed959bb5922a463cbc 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;
@@ -87,7 +87,7 @@ index f99e5fef954ac4411a03daad2de6e0dcdd19a40f..5dd3cb5ff66242fca54a1a9aec9a3b1f
import top.leavesmc.leaves.bot.BotCommand;
import top.leavesmc.leaves.bot.agent.Actions;
import top.leavesmc.leaves.util.MathUtils;
@@ -469,6 +471,24 @@ public final class LeavesConfig {
@@ -471,6 +473,24 @@ public final class LeavesConfig {
}
}

4
patches/server/0056-Return-nether-portal-fix.patch
View File

@@ -134,10 +134,10 @@ index 523a46eb4a23b4a4aa9e5ea38771a5953c1bdccc..00d88ed58b8fe93e8655d675f9d5e4f8
@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 5dd3cb5ff66242fca54a1a9aec9a3b1ff10ea0ab..70d46fed0485bc242889fad43b4ceca98c02bf53 100644
index 01f2fcbdae8bfd3fcce13fed959bb5922a463cbc..238458774bb335b5479f58bd38b195cf14f165bb 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -489,6 +489,11 @@ public final class LeavesConfig {
@@ -491,6 +491,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0057-Appleskin-Protocol.patch
View File

@@ -55,10 +55,10 @@ index 640bf562bc2b29bbba5375eea5bc4714b4bb9873..2a4c9ed93790a77b00dcc32996043f5a
// 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 70d46fed0485bc242889fad43b4ceca98c02bf53..3ad68e2775951ea67a4761edd5d059c360afd9bf 100644
index 238458774bb335b5479f58bd38b195cf14f165bb..72d97a4a632bac3766d74f9155f2ab66a2b8e4ad 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -494,6 +494,11 @@ public final class LeavesConfig {
@@ -496,6 +496,11 @@ public final class LeavesConfig {
netherPortalFix = getBoolean("settings.modify.return-nether-portal-fix", netherPortalFix);
}

4
patches/server/0058-Xaero-Map-Protocol.patch
View File

@@ -17,7 +17,7 @@ index 023196e501f627621861851d3bcd7576d883994d..528a039c1edc2edafadd56b5dc5cb337
// 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 3ad68e2775951ea67a4761edd5d059c360afd9bf..4acc4caadcf267c9d3f41be213e90af619970893 100644
index 72d97a4a632bac3766d74f9155f2ab66a2b8e4ad..3c4b65fee57c4bb074d2770f974329118e2104c1 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 3ad68e2775951ea67a4761edd5d059c360afd9bf..4acc4caadcf267c9d3f41be213e90af6
import java.util.logging.Level;
// Powered by Tuinity(https://github.com/Tuinity/Tuinity)
@@ -499,6 +500,13 @@ public final class LeavesConfig {
@@ -501,6 +502,13 @@ public final class LeavesConfig {
appleskinProtocol = getBoolean("settings.protocol.appleskin-protocol", appleskinProtocol);
}

6
patches/server/0059-Leaves-Extra-Yggdrasil-Service.patch
View File

@@ -18,7 +18,7 @@ index 1459a1f99fe614d072a087cda18788cf13102645..73bfda834fa704b208a5dd9271bb397a
super(proxy);
this.environment = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index c6fa6bcd66d61359124a8426b919493c6ec43f06..dd84d4d0adadb1d1cbe3670df35fc8fc048b7295 100644
index cdbf10339a8e8846a8c364de483a0ccd95cd225a..60bfeafed9a6ce7a8b9de128268f462bc0f7d947 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -193,7 +193,7 @@ public class Main {
@@ -31,7 +31,7 @@ index c6fa6bcd66d61359124a8426b919493c6ec43f06..dd84d4d0adadb1d1cbe3670df35fc8fc
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 4acc4caadcf267c9d3f41be213e90af619970893..f1c5a63a41c7cf7aa01fbc875a06a0dc43ff81f3 100644
index 3c4b65fee57c4bb074d2770f974329118e2104c1..704118ad6a19df9a5ee9428265efe8c776504109 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -42,7 +42,7 @@ index 4acc4caadcf267c9d3f41be213e90af619970893..f1c5a63a41c7cf7aa01fbc875a06a0dc
import top.leavesmc.leaves.util.MathUtils;
import java.io.File;
@@ -507,6 +508,18 @@ public final class LeavesConfig {
@@ -509,6 +510,18 @@ public final class LeavesConfig {
xaeroMapServerID = getInt("settings.protocol.xaero-map-server-id", xaeroMapServerID);
}

4
patches/server/0060-Use-vanilla-random-config.patch
View File

@@ -31,10 +31,10 @@ index 72eea6e512060fc622ca79ca87437f19a64604cc..f5413946fecaa0d7b9d41dd06f12c460
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index f1c5a63a41c7cf7aa01fbc875a06a0dc43ff81f3..a4a0255e537945f49398bf3bc76183c48ff47bb8 100644
index 704118ad6a19df9a5ee9428265efe8c776504109..e1017c5cf088fe90b10e87bd04d4f33ba29cfb0b 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -520,6 +520,15 @@ public final class LeavesConfig {
@@ -522,6 +522,15 @@ public final class LeavesConfig {
}
}

4
patches/server/0061-Fix-update-suppression-crash.patch
View File

@@ -61,10 +61,10 @@ index 19faa8f5f891c1ffbed0af8391dee8202433c447..0f8d5495f9f7306f3267a0741cb6a1a6
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block being updated");
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index a4a0255e537945f49398bf3bc76183c48ff47bb8..6be019bf5f50b9048f66808ef296f5c7c9b4cf14 100644
index e1017c5cf088fe90b10e87bd04d4f33ba29cfb0b..206f4256775a1527dfee1ed38f8c8c07a49269f6 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -529,6 +529,11 @@ public final class LeavesConfig {
@@ -531,6 +531,11 @@ public final class LeavesConfig {
}
}

4
patches/server/0062-Bedrock-break-list.patch
View File

@@ -79,10 +79,10 @@ index f456ad8a74464414f69b616a48ee9a2c1cee4d90..ab39df0ea273a5c9a67b34caa68e9262
} else {
((ServerLevel)world).getChunkSource().blockChanged(headPos); // ... fix client desync
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 6be019bf5f50b9048f66808ef296f5c7c9b4cf14..331436c240fdc73ad08e9e6f294b57df1d072d92 100644
index 206f4256775a1527dfee1ed38f8c8c07a49269f6..9500f0fe556b7a35e97c97c8cf4726fd68e8170c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -534,6 +534,15 @@ public final class LeavesConfig {
@@ -536,6 +536,15 @@ public final class LeavesConfig {
updateSuppressionCrashFix = getBoolean("settings.modify.fix-update-suppression-crash", updateSuppressionCrashFix);
}

4
patches/server/0063-Syncmatica-Protocol.patch
View File

@@ -54,7 +54,7 @@ index 845858a5d24af704e360af16753e533ad6b43d33..735c9ac641671c4a92de3fc079664be4
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/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 331436c240fdc73ad08e9e6f294b57df1d072d92..71665d4b1a30dffd0e5c83229a678af3d4c89c1b 100644
index 9500f0fe556b7a35e97c97c8cf4726fd68e8170c..130a5b9a6b08cd3ec022d27b861f17819cd27f94 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -12,6 +12,7 @@ import org.spigotmc.SpigotConfig;
@@ -65,7 +65,7 @@ index 331436c240fdc73ad08e9e6f294b57df1d072d92..71665d4b1a30dffd0e5c83229a678af3
import top.leavesmc.leaves.util.MathUtils;
import java.io.File;
@@ -543,6 +544,18 @@ public final class LeavesConfig {
@@ -545,6 +546,18 @@ public final class LeavesConfig {
}
}