9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-22 08:29:22 +00:00

Fakeplayer prefix and suffix support

This commit is contained in:
violetc
2023-01-24 10:43:02 +08:00
parent 96d8bd7448
commit fd1c897740
44 changed files with 123 additions and 123 deletions

View File

@@ -83,7 +83,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..2bdd75f4e48a232d2cc7c24475caafa2
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 8961310c0789c4dd95a729ecc0b8dbf8d701ffc4..2ea10cb889df8f3a3ad228933232c0bf591be6dc 100644
index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..9ecc6e12cea85e96f55705ff5ee831732c614c91 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -80,6 +80,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -170,7 +170,7 @@ index 78f53ee557276de85f0431ebcb146445b1f4fb92..42a2e411fd769bf0bf034141297e890c
}
// Water Animals
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 1fb25e8a21b568864974cc81b452ba062890d593..c32825a237a539035828a9c85673ea0e4347b259 100644
index 1fb25e8a21b568864974cc81b452ba062890d593..14e80a17e332229c2cfa5e954ab21dee814ec141 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -7,11 +7,13 @@ import org.bukkit.Bukkit;
@@ -225,23 +225,21 @@ index 1fb25e8a21b568864974cc81b452ba062890d593..c32825a237a539035828a9c85673ea0e
public static boolean playerCanEditSign = true;
private static void playerCanEditSign() {
playerCanEditSign = getBoolean("settings.modify.player-can-edit-sign", playerCanEditSign);
@@ -146,6 +162,21 @@ public final class LeavesConfig {
@@ -146,6 +162,19 @@ public final class LeavesConfig {
snowballAndEggCanKnockback = getBoolean("settings.modify.snowball-and-egg-can-knockback-player", snowballAndEggCanKnockback);
}
+ public static boolean fakeplayerSupport = true;
+ private static void fakeplayerSupport() {
+ fakeplayerSupport = getBoolean("settings.modify.fakeplayer.enable", fakeplayerSupport);
+ }
+
+ public static List<String> unableFakeplayerNames = List.of("player-name");
+ private static void unableFakeplayerNames() {
+ unableFakeplayerNames = getList("settings.modify.fakeplayer.unable-fakeplayer-names", unableFakeplayerNames);
+ }
+
+ public static int fakeplayerLimit = 10;
+ private static void fakeplayerLimit() {
+ public static String fakeplayerPrefix = "";
+ public static String fakeplayerSuffix = "";
+ public static void fakeplayer() {
+ fakeplayerSupport = getBoolean("settings.modify.fakeplayer.enable", fakeplayerSupport);
+ unableFakeplayerNames = getList("settings.modify.fakeplayer.unable-fakeplayer-names", unableFakeplayerNames);
+ fakeplayerLimit = getInt("settings.modify.fakeplayer.limit", fakeplayerLimit);
+ fakeplayerPrefix = getString("settings.modify.fakeplayer.prefix", fakeplayerPrefix);
+ fakeplayerSuffix = getString("settings.modify.fakeplayer.suffix", fakeplayerSuffix);
+ }
+
public static final class WorldConfig {
@@ -574,10 +572,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..f305b51cb13899786b8e927600fc7fa104dad3f8
index 0000000000000000000000000000000000000000..2ea8875e702dbec3df1019d2c789b6864d955ef9
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java
@@ -0,0 +1,737 @@
@@ -0,0 +1,739 @@
+package top.leavesmc.leaves.bot;
+
+import com.google.common.collect.Lists;
@@ -629,6 +627,7 @@ index 0000000000000000000000000000000000000000..f305b51cb13899786b8e927600fc7fa1
+import org.bukkit.util.BoundingBox;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import top.leavesmc.leaves.LeavesConfig;
+import top.leavesmc.leaves.entity.Bot;
+import top.leavesmc.leaves.entity.CraftBot;
+import top.leavesmc.leaves.event.bot.BotCreateEvent;
@@ -682,17 +681,18 @@ index 0000000000000000000000000000000000000000..f305b51cb13899786b8e927600fc7fa1
+ this.removeOnDeath = true;
+ }
+
+ public static void createBot(Location loc, String name, String skinName) {
+ if (!checkCreateLegal(name)) {
+ public static void createBot(Location loc, String name , String skinName) {
+ String realName = LeavesConfig.fakeplayerPrefix + name + LeavesConfig.fakeplayerSuffix;
+ if (!checkCreateLegal(realName)) {
+ return;
+ }
+ if (skinName != null) {
+ Bukkit.getScheduler().runTaskAsynchronously(MINECRAFT_PLUGIN, () -> {
+ String[] skin = MojangAPI.getSkin(skinName);
+ Bukkit.getScheduler().runTask(MINECRAFT_PLUGIN, () -> createBot(loc, name, skin));
+ Bukkit.getScheduler().runTask(MINECRAFT_PLUGIN, () -> createBot(loc, realName, skin));
+ });
+ } else {
+ createBot(loc, name, (String[]) null);
+ createBot(loc, realName, (String[]) null);
+ }
+ }
+

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Make shears in dispenser can unlimited use
diff --git a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
index 2366d411bf64f88c7296e888cd3bf584825ae4a9..7da29029038d5a007735dcb2be0114581d85d098 100644
index d1127d93a85a837933d0d73c24cacac4adc3a5b9..bca725f614893458f825768e8dfb6ff9ed0d4075 100644
--- a/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+++ b/src/main/java/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
@@ -63,7 +63,7 @@ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
@@ -18,7 +18,7 @@ index 2366d411bf64f88c7296e888cd3bf584825ae4a9..7da29029038d5a007735dcb2be011458
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index c32825a237a539035828a9c85673ea0e4347b259..1362fdf564f76eb8a8d84ac6b3f5031d2dc5c197 100644
index 14e80a17e332229c2cfa5e954ab21dee814ec141..8b976c3bfacc040160ad1bab396700f7c44ba0f6 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 c32825a237a539035828a9c85673ea0e4347b259..1362fdf564f76eb8a8d84ac6b3f5031d
}
}
@@ -177,6 +179,11 @@ public final class LeavesConfig {
fakeplayerLimit = getInt("settings.modify.fakeplayer.limit", fakeplayerLimit);
@@ -175,6 +177,11 @@ public final class LeavesConfig {
fakeplayerSuffix = getString("settings.modify.fakeplayer.suffix", fakeplayerSuffix);
}
+ public static boolean shearsInDispenserCanZeroAmount = false;

View File

@@ -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 1362fdf564f76eb8a8d84ac6b3f5031d2dc5c197..f0c9913333c055993257756ead252ec4dc6914fa 100644
index 8b976c3bfacc040160ad1bab396700f7c44ba0f6..1b7024efd3da857e6242f5e6d3691a9bf609b05f 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 {
@@ -115,7 +115,7 @@ index 1362fdf564f76eb8a8d84ac6b3f5031d2dc5c197..f0c9913333c055993257756ead252ec4
}
}
@@ -184,6 +186,11 @@ public final class LeavesConfig {
@@ -182,6 +184,11 @@ public final class LeavesConfig {
shearsInDispenserCanZeroAmount = getBoolean("settings.modify.shears-in-dispenser-can-zero-amount", shearsInDispenserCanZeroAmount);
}

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 f0c9913333c055993257756ead252ec4dc6914fa..4b10a17d000e06bf0e3e1088eaf6553af0cd2068 100644
index 1b7024efd3da857e6242f5e6d3691a9bf609b05f..90d22a33c38ea539cedb5cd1f63619972df13962 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 f0c9913333c055993257756ead252ec4dc6914fa..4b10a17d000e06bf0e3e1088eaf6553a
}
}
@@ -191,6 +193,11 @@ public final class LeavesConfig {
@@ -189,6 +191,11 @@ public final class LeavesConfig {
redstoneShearsWrench = getBoolean("settings.modify.redstone-shears-wrench", redstoneShearsWrench);
}

View File

@@ -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 4b10a17d000e06bf0e3e1088eaf6553af0cd2068..07911d9286b785f63fc784e1363370c86b719a9d 100644
index 90d22a33c38ea539cedb5cd1f63619972df13962..59f169622012e3fadbd7f3394ccaa2d2dc2ebb8e 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 4b10a17d000e06bf0e3e1088eaf6553af0cd2068..07911d9286b785f63fc784e1363370c8
}
}
@@ -197,6 +199,11 @@ public final class LeavesConfig {
@@ -195,6 +197,11 @@ public final class LeavesConfig {
private static void buddingAmethystCanPushByPiston() {
buddingAmethystCanPushByPiston = getBoolean("settings.modify.budding-amethyst-can-push-by-piston", buddingAmethystCanPushByPiston);
}

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stick can change ArmorStand arm status
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index 150afceb491cfd254c0f1b84800e6df14cf26676..e108e757a6dab69784324625e9be00afbef6689e 100644
index b136cdc13d94bc34c998a1986e0c93525356ac5c..a1dd65d71606e1da07be781bf95a326882fa8c9e 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -384,6 +384,12 @@ public class ArmorStand extends LivingEntity {
@@ -22,7 +22,7 @@ index 150afceb491cfd254c0f1b84800e6df14cf26676..e108e757a6dab69784324625e9be00af
return InteractionResult.FAIL;
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 07911d9286b785f63fc784e1363370c86b719a9d..06bf70f13432f557a65d3dad563f9014998839a6 100644
index 59f169622012e3fadbd7f3394ccaa2d2dc2ebb8e..c3557e412dc5a91e51b6c7058566f27833205069 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 07911d9286b785f63fc784e1363370c86b719a9d..06bf70f13432f557a65d3dad563f9014
}
}
@@ -204,6 +206,11 @@ public final class LeavesConfig {
@@ -202,6 +204,11 @@ public final class LeavesConfig {
private static void spectatorDontGetAdvancement() {
spectatorDontGetAdvancement = getBoolean("settings.modify.spectator-dont-get-advancement", spectatorDontGetAdvancement);
}

View File

@@ -158,7 +158,7 @@ index 9ecc6e12cea85e96f55705ff5ee831732c614c91..f6c1dbde282e51322d655302340704e4
// CraftBukkit start
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 06bf70f13432f557a65d3dad563f9014998839a6..857b8881ba2d526ee366aa04228b72bc8d7c8c47 100644
index c3557e412dc5a91e51b6c7058566f27833205069..8d3dfe2386e977eb79fd40ecb5eb728ced83b420 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 {
@@ -177,7 +177,7 @@ index 06bf70f13432f557a65d3dad563f9014998839a6..857b8881ba2d526ee366aa04228b72bc
}
}
@@ -211,6 +213,15 @@ public final class LeavesConfig {
@@ -209,6 +211,15 @@ public final class LeavesConfig {
private static void stickChangeArmorStandHasArm() {
stickChangeArmorStandArmStatus = getBoolean("settings.modify.stick-change-armorstand-arm-status", stickChangeArmorStandArmStatus);
}

View File

@@ -151,10 +151,10 @@ 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 857b8881ba2d526ee366aa04228b72bc8d7c8c47..6f0d0c255e7767c31605effbcb0b41659f0b8ddb 100644
index 8d3dfe2386e977eb79fd40ecb5eb728ced83b420..0dbae8e8739b759d10b14ba69c19e863b009b89a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -222,7 +222,16 @@ public final class LeavesConfig {
@@ -220,7 +220,16 @@ public final class LeavesConfig {
}
noChatSign = getBoolean("settings.misc.no-chat-sign", noChatSign);
}

View File

@@ -69,10 +69,10 @@ 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 6f0d0c255e7767c31605effbcb0b41659f0b8ddb..f4e5b84f0bd952676950369eff44b87fe1c46f1b 100644
index 0dbae8e8739b759d10b14ba69c19e863b009b89a..fc3125bba031fd6b02d4c308a441bc57750e4363 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -232,6 +232,11 @@ public final class LeavesConfig {
@@ -230,6 +230,11 @@ public final class LeavesConfig {
}
}

View File

@@ -174,10 +174,10 @@ 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 f4e5b84f0bd952676950369eff44b87fe1c46f1b..c9adf62da15389d2548f8f4540395f73dcdf243f 100644
index fc3125bba031fd6b02d4c308a441bc57750e4363..a9ec45f0e0da650d34480a61253e9944d56dac1e 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -237,6 +237,20 @@ public final class LeavesConfig {
@@ -235,6 +235,20 @@ public final class LeavesConfig {
dontSendUselessEntityPackets = getBoolean("settings.performance.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
}

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 c9adf62da15389d2548f8f4540395f73dcdf243f..3907bbfae224be1467bead2e13a7eace7e75e579 100644
index a9ec45f0e0da650d34480a61253e9944d56dac1e..1476e2433ed07d3e1ec86ee0e3a84c7e6f16a147 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -251,6 +251,11 @@ public final class LeavesConfig {
@@ -249,6 +249,11 @@ public final class LeavesConfig {
}
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize entity coordinate key
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index e63dc33250831428c2cef34e02238600231fb815..8a0ade1d64d1028f38b756e94f51674f48296551 100644
index d1a59c2af0557a816c094983ec60097fb4de060c..25e77520f269e25492d14d498f51c16b5c0c3c2d 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -209,7 +209,13 @@ public final class MCUtil {
@@ -25,7 +25,7 @@ index e63dc33250831428c2cef34e02238600231fb815..8a0ade1d64d1028f38b756e94f51674f
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 54c730dca6ea06d2dcde19d9c431ef7c0fffff29..ea287169df654c361a2b27148907578b634c1bba 100644
index 07755625a713359e468eb907fdc7667e719a28a7..a4f32bb4d474c97e9b924e1d275f640ddfedc31f 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,10 +38,10 @@ index 54c730dca6ea06d2dcde19d9c431ef7c0fffff29..ea287169df654c361a2b27148907578b
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 3907bbfae224be1467bead2e13a7eace7e75e579..578bbec4431366e55a615ccbb5e7c8d0a50d668b 100644
index 1476e2433ed07d3e1ec86ee0e3a84c7e6f16a147..5856270f8f4e0eb6b89ed36b361af958066d341c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -256,6 +256,12 @@ public final class LeavesConfig {
@@ -254,6 +254,12 @@ public final class LeavesConfig {
fixPaper6045 = getBoolean("settings.performance.fix.fix-paper-6045", fixPaper6045);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index be1b2d83666a3d7cb67c864590e9b2fbbf583a10..87e576b6e070e5d7bed803906e1f10817f18d965 100644
index f577dcc95bba43a2aa8a3a54b3afbcf50e93d52b..42f89171251a5f2dcd6e75eaa1135b34f1e34d6b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -402,7 +402,7 @@ public abstract class LivingEntity extends Entity {
@@ -35,10 +35,10 @@ index be1b2d83666a3d7cb67c864590e9b2fbbf583a10..87e576b6e070e5d7bed803906e1f1081
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 578bbec4431366e55a615ccbb5e7c8d0a50d668b..64fc662bcf102df1fd971e9bc72b96ebfe3cda32 100644
index 5856270f8f4e0eb6b89ed36b361af958066d341c..317e145bd2f17fc97a64e87b81589d22fb6c716a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -261,6 +261,10 @@ public final class LeavesConfig {
@@ -259,6 +259,10 @@ public final class LeavesConfig {
optimizeEntityCoordinateKey = getBoolean("settings.performance.optimize-entity-coordinate-key", optimizeEntityCoordinateKey);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 87e576b6e070e5d7bed803906e1f10817f18d965..1d52da0e31a1969b99339c510924ede8851449d4 100644
index 42f89171251a5f2dcd6e75eaa1135b34f1e34d6b..48ab2b1a7785ef553463fcd03edd6609ecf454ac 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3656,7 +3656,13 @@ public abstract class LivingEntity extends Entity {
@@ -142,10 +142,10 @@ 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 64fc662bcf102df1fd971e9bc72b96ebfe3cda32..d170232e4da4c67c343f3e4393ae7153e0b3002e 100644
index 317e145bd2f17fc97a64e87b81589d22fb6c716a..748bbcc2e0e8c019e9f7e7591adebf76c3ac2538 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -266,6 +266,11 @@ public final class LeavesConfig {
@@ -264,6 +264,11 @@ public final class LeavesConfig {
enableSuffocationOptimization = getBoolean("settings.performance.enable-suffocation-optimization", enableSuffocationOptimization);
}

View File

@@ -45,10 +45,10 @@ 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 d170232e4da4c67c343f3e4393ae7153e0b3002e..7c2d8f57704cbefbf6231848c5e31553e43ca02c 100644
index 748bbcc2e0e8c019e9f7e7591adebf76c3ac2538..ed70b41e81473abecd5b10a2afa8dd8ae184870c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -271,6 +271,11 @@ public final class LeavesConfig {
@@ -269,6 +269,11 @@ public final class LeavesConfig {
entityStripRaytracing = getBoolean("settings.performance.strip-raytracing-for-entity", entityStripRaytracing);
}

View File

@@ -93,10 +93,10 @@ 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 7c2d8f57704cbefbf6231848c5e31553e43ca02c..3647b4fe0d875af39bf55c5f8bf1bd9cf08709a8 100644
index ed70b41e81473abecd5b10a2afa8dd8ae184870c..a64bdc9e6f43f841ecb13e7ec53102ec75ea485f 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -276,6 +276,15 @@ public final class LeavesConfig {
@@ -274,6 +274,15 @@ public final class LeavesConfig {
checkSpookySeasonOnceAnHour = getBoolean("settings.performance.check-spooky-season-once-an-hour", checkSpookySeasonOnceAnHour);
}

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 3647b4fe0d875af39bf55c5f8bf1bd9cf08709a8..179cb93d9dc77bcfef6a8d6bc73a3290483a67f5 100644
index a64bdc9e6f43f841ecb13e7ec53102ec75ea485f..85e3bc9e5ebfc6662609f13c2145e16208ac1ee2 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -285,6 +285,11 @@ public final class LeavesConfig {
@@ -283,6 +283,11 @@ public final class LeavesConfig {
}
}

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 179cb93d9dc77bcfef6a8d6bc73a3290483a67f5..3e06ad7a31d6f35a55f8c2e6b9d2a666618168ab 100644
index 85e3bc9e5ebfc6662609f13c2145e16208ac1ee2..633e2a82e3da2f50df0c3dd3e1d04d48db0f3f65 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -289,6 +289,11 @@ public final class LeavesConfig {
@@ -287,6 +287,11 @@ public final class LeavesConfig {
private static void skipPOIFindingInVehicle() {
skipPOIFindingInVehicle = getBoolean("settings.performance.skip-poi-find-in-vehicle", skipPOIFindingInVehicle);
}

View File

@@ -38,10 +38,10 @@ 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 3e06ad7a31d6f35a55f8c2e6b9d2a666618168ab..4f5717d181c591b03cf78694a95e64be982517d8 100644
index 633e2a82e3da2f50df0c3dd3e1d04d48db0f3f65..9c3aef2156647d2e1cca49f87f80e880f857fcdd 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -295,6 +295,11 @@ public final class LeavesConfig {
@@ -293,6 +293,11 @@ public final class LeavesConfig {
entityTargetFindingOptimization = getBoolean("settings.performance.entity-target-find-optimization", entityTargetFindingOptimization);
}

View File

@@ -38,10 +38,10 @@ index 7d6fe65dc64afa00ecef0d1be2e13507086ab81a..dda31b5eea92ce3de9de0e4054ee9c7f
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 4f5717d181c591b03cf78694a95e64be982517d8..89ec4bd328fe08407552f4e26d6ac4586fd1d697 100644
index 9c3aef2156647d2e1cca49f87f80e880f857fcdd..d08e08bc7dbb5a1ed0a11d50d09ab22089429167 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -300,6 +300,11 @@ public final class LeavesConfig {
@@ -298,6 +298,11 @@ public final class LeavesConfig {
useMoreThreadUnsafeRandom = getBoolean("settings.performance.use-more-thread-unsafe-random", useMoreThreadUnsafeRandom);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Throttle goal selector during inactive ticking
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index fffa6ba329b38433a1df51df339df652d3fda828..f65bdf9a94db15b8b82a6f8dd729fb435610defa 100644
index 49b983064ea810382b6112f5dc7f93ba4e5710bd..3948d4c6bf1f3942b6496ee2a887666595e0eebc 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -210,11 +210,13 @@ public abstract class Mob extends LivingEntity {
@@ -25,10 +25,10 @@ index fffa6ba329b38433a1df51df339df652d3fda828..f65bdf9a94db15b8b82a6f8dd729fb43
}
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 89ec4bd328fe08407552f4e26d6ac4586fd1d697..c21ba7b31a6ee4599f0e7e0b2dbf4a5e46a53a19 100644
index d08e08bc7dbb5a1ed0a11d50d09ab22089429167..f5d5b55725d7f57769cee38129851a3a3afde45f 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -305,6 +305,11 @@ public final class LeavesConfig {
@@ -303,6 +303,11 @@ public final class LeavesConfig {
disableMethodProfiler = getBoolean("settings.misc.disable-method-profiler", disableMethodProfiler);
}

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 c21ba7b31a6ee4599f0e7e0b2dbf4a5e46a53a19..0bba3458e6fc75a9d542691054cc255a521496c6 100644
index f5d5b55725d7f57769cee38129851a3a3afde45f..98ddb7e0dfc65d0c59aca72d42c34bf9c6cd78b4 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -310,6 +310,11 @@ public final class LeavesConfig {
@@ -308,6 +308,11 @@ public final class LeavesConfig {
throttleInactiveGoalSelectorTick = getBoolean("settings.performance.inactive-goal-selector-disable", throttleInactiveGoalSelectorTick);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Reduce entity allocations
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b486fa2368544bfad7afc512200ba0a1c553e12b..b433f122489467feb4d7efca2462effae9ebdd7a 100644
index a4f32bb4d474c97e9b924e1d275f640ddfedc31f..fdd166d99e80c56ba317596e2e50960aae7b87a2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -414,6 +414,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -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 0bba3458e6fc75a9d542691054cc255a521496c6..a557ea7adbb82dfff5c383b1d9acb8e0487fd4e9 100644
index 98ddb7e0dfc65d0c59aca72d42c34bf9c6cd78b4..1f905774b480acbdfcaf53279b8d33b7af1044de 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -315,6 +315,11 @@ public final class LeavesConfig {
@@ -313,6 +313,11 @@ public final class LeavesConfig {
skipCloneLootParameters = getBoolean("settings.performance.skip-clone-loot-parameters", skipCloneLootParameters);
}

View File

@@ -36,10 +36,10 @@ index c41ae38038fb0f9e2010c59bd25860c9051034bb..1b17976702676755c986512507bfc322
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index a557ea7adbb82dfff5c383b1d9acb8e0487fd4e9..92fae1f8b08038d4451643aaedaa63a000a32034 100644
index 1f905774b480acbdfcaf53279b8d33b7af1044de..4ed2cb4cf22c3af23567ee06120d4dd6344a70f4 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -320,6 +320,11 @@ public final class LeavesConfig {
@@ -318,6 +318,11 @@ public final class LeavesConfig {
reduceEntityAllocations = getBoolean("settings.performance.reduce-entity-allocations", reduceEntityAllocations);
}

View File

@@ -55,10 +55,10 @@ index 5bc033bf59d49eda1f8f2574165bbcbeab7faa0f..cf89cbffabf8b88265b5ffbc42b55fe6
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 92fae1f8b08038d4451643aaedaa63a000a32034..914744995ff7637f063afe1a45d577f41d2c30d9 100644
index 4ed2cb4cf22c3af23567ee06120d4dd6344a70f4..7aa5a818a9b4e4dc44c198cafb349813cc7518d1 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -325,6 +325,11 @@ public final class LeavesConfig {
@@ -323,6 +323,11 @@ public final class LeavesConfig {
removeTickGuardLambda = getBoolean("settings.performance.remove.tick-guard-lambda", removeTickGuardLambda);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Remove streams from getting nearby players
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b433f122489467feb4d7efca2462effae9ebdd7a..a629ba230cd5824401a1854ab46a07f64466bacf 100644
index fdd166d99e80c56ba317596e2e50960aae7b87a2..ebf7b1a91c0882f61696a16bf4dc5adf62072033 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -490,25 +490,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -68,10 +68,10 @@ index b433f122489467feb4d7efca2462effae9ebdd7a..a629ba230cd5824401a1854ab46a07f6
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 914744995ff7637f063afe1a45d577f41d2c30d9..c83b3b5fb99a9730632e03f0f7d2d4e4ac510049 100644
index 7aa5a818a9b4e4dc44c198cafb349813cc7518d1..84d4571f50c5dd4399cd3a0324b9adff28a929d5 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -330,6 +330,11 @@ public final class LeavesConfig {
@@ -328,6 +328,11 @@ public final class LeavesConfig {
removeInventoryContainsIterators = getBoolean("settings.performance.remove.inventory-contains-iterators", removeInventoryContainsIterators);
}

View File

@@ -65,10 +65,10 @@ 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 c83b3b5fb99a9730632e03f0f7d2d4e4ac510049..6924ca89da0decc8f861842b770d0cfae7fc0ba1 100644
index 84d4571f50c5dd4399cd3a0324b9adff28a929d5..8108e415b974a85c2ceff5967fe72e93ea7d1f93 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -335,6 +335,11 @@ public final class LeavesConfig {
@@ -333,6 +333,11 @@ public final class LeavesConfig {
removeGetNearPlayerStreams = getBoolean("settings.performance.remove.get-nearby-players-streams", removeGetNearPlayerStreams);
}

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 6924ca89da0decc8f861842b770d0cfae7fc0ba1..92f27779e8fdf827c2305c4531f478f2b179ecb9 100644
index 8108e415b974a85c2ceff5967fe72e93ea7d1f93..f9653c2e5856ae68c7cc81fcaf1bbaac2b363aef 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -340,6 +340,21 @@ public final class LeavesConfig {
@@ -338,6 +338,21 @@ public final class LeavesConfig {
removeRangeCheckStreams = getBoolean("settings.performance.remove.range-check-streams-and-iterators", removeRangeCheckStreams);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1d52da0e31a1969b99339c510924ede8851449d4..d131f76617f8fe09b1d81fad5a9c1ea58b9a0407 100644
index 48ab2b1a7785ef553463fcd03edd6609ecf454ac..7647b8bb3117d005dd616b29e7310f8328973b7f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1943,6 +1943,22 @@ public abstract class LivingEntity extends Entity {
@@ -33,7 +33,7 @@ index 1d52da0e31a1969b99339c510924ede8851449d4..d131f76617f8fe09b1d81fad5a9c1ea5
if (this.isSpectator()) {
return false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 1b42c98956342832c37f0aa266f85271daa4ba5b..b255456f7b9e154f128eace3e220e0010e3f226b 100644
index e881584d38dc354204479863f004e974a0ac6c07..9f17c6acb54a7620656832df62e57e9d447c7ffc 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -291,7 +291,7 @@ public class ActivationRange
@@ -46,10 +46,10 @@ index 1b42c98956342832c37f0aa266f85271daa4ba5b..b255456f7b9e154f128eace3e220e001
return 1; // Paper
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 92f27779e8fdf827c2305c4531f478f2b179ecb9..a144420ff6a351e567c3dade9e5a7d02510a9b70 100644
index f9653c2e5856ae68c7cc81fcaf1bbaac2b363aef..d847120f2b3c75eeed5694e455c8373b070a3e4a 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -355,6 +355,11 @@ public final class LeavesConfig {
@@ -353,6 +353,11 @@ public final class LeavesConfig {
}
}

View File

@@ -102,10 +102,10 @@ 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 a144420ff6a351e567c3dade9e5a7d02510a9b70..1fc965f3f082ec4ab4c4d45458d9512998ebb57b 100644
index d847120f2b3c75eeed5694e455c8373b070a3e4a..ef66f6516f7f20320ea6f372ab5ab5bce6059af2 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -360,6 +360,15 @@ public final class LeavesConfig {
@@ -358,6 +358,15 @@ public final class LeavesConfig {
cacheClimbCheck = getBoolean("settings.performance.cache-climb-check", cacheClimbCheck);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a629ba230cd5824401a1854ab46a07f64466bacf..1be77824bd60c3eeeb748157f3fe2efb9051d9a4 100644
index ebf7b1a91c0882f61696a16bf4dc5adf62072033..fa9ec5f51ed7762677d3bcee9f727cb9db902fb0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4091,16 +4091,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -217,10 +217,10 @@ index b0c9fce9d4e06cac139e341d218d0b6aac1f1943..f53fee91b78ba4c1e17360a40d5a94fe
});
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 1fc965f3f082ec4ab4c4d45458d9512998ebb57b..cbf22dc0723b623f44aab059644c439984e21ec4 100644
index ef66f6516f7f20320ea6f372ab5ab5bce6059af2..a9a08326fbfb1887ca77e10fa38fe080aa5021a7 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -369,6 +369,11 @@ public final class LeavesConfig {
@@ -367,6 +367,11 @@ public final class LeavesConfig {
}
}

View File

@@ -42,10 +42,10 @@ 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 cbf22dc0723b623f44aab059644c439984e21ec4..724917fda96daa17da900cfc226a076f68cd8ca6 100644
index a9a08326fbfb1887ca77e10fa38fe080aa5021a7..8d2d6fe26e146131dcadb1e2ac5e182f91865410 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -374,6 +374,11 @@ public final class LeavesConfig {
@@ -372,6 +372,11 @@ public final class LeavesConfig {
reduceEntityFluidLookup = getBoolean("settings.performance.reduce-entity-fluid-lookup", reduceEntityFluidLookup);
}

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 724917fda96daa17da900cfc226a076f68cd8ca6..d4a65880aed6f7bc2973e8e6011f3959f37caf15 100644
index 8d2d6fe26e146131dcadb1e2ac5e182f91865410..5212eb46f34ae1c143027d1ce8d001cb647dcfc4 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -379,6 +379,11 @@ public final class LeavesConfig {
@@ -377,6 +377,11 @@ public final class LeavesConfig {
reduceChuckLoadAndLookup = getBoolean("settings.performance.reduce-chuck-load-and-lookup", reduceChuckLoadAndLookup);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index cfcc76eec4af149621208993ecd41b1d8555190d..e1428d9a9f428b6e7b5b08f7f7e8adb7acb26e2f 100644
index af8d49e22ee3447ea6acc4b64fcb5713734c8fd3..78f112575c2f8973e8aa66fb0fc44a18ec4758b5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -241,6 +241,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -35,7 +35,7 @@ index cfcc76eec4af149621208993ecd41b1d8555190d..e1428d9a9f428b6e7b5b08f7f7e8adb7
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 2dcaae80940ae03f9f305d5d673657d4cfa03518..71863f9102fc55221740ae9f5ccb9293095a45a7 100644
index f6c1dbde282e51322d655302340704e4a8af766f..7b309f0fd34ca1071f221d5b97288f400b69c00a 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 {
@@ -83,7 +83,7 @@ index ca96b893e22de3ae7c11d5cded51edf70bdcb6f2..a0380713ff1e3faa285c76ea45f75c9c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index b8fb7b5a347298ada16bc8b818edf1863e3f6040..ca71b5b61d85df4a3e74c69823184b52cab98f67 100644
index cc74eeb45913fab03e85969957215d2811252a83..69a8436a343d7b0738e74700a01966111e37a17a 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -129,7 +129,13 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
@@ -369,10 +369,10 @@ 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 d4a65880aed6f7bc2973e8e6011f3959f37caf15..cb09cbb64bfe8de91a78b2dd1dc135f5d5688477 100644
index 5212eb46f34ae1c143027d1ce8d001cb647dcfc4..3b2bba20f4ecf9f49ad13bd0a385cf791fcccb56 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -384,6 +384,21 @@ public final class LeavesConfig {
@@ -382,6 +382,21 @@ public final class LeavesConfig {
simplerVanillaShapelessRecipes = getBoolean("settings.performance.simpler-vanilla-shapeless-recipes", simplerVanillaShapelessRecipes);
}

View File

@@ -95,10 +95,10 @@ 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 cb09cbb64bfe8de91a78b2dd1dc135f5d5688477..25a86927e6616a9b2105c06d789bc74c7efa6e60 100644
index 3b2bba20f4ecf9f49ad13bd0a385cf791fcccb56..95ae9149cce083e1902db0a0aa7f809fea55fb05 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -399,6 +399,11 @@ public final class LeavesConfig {
@@ -397,6 +397,11 @@ public final class LeavesConfig {
}
}

View File

@@ -33,10 +33,10 @@ 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 25a86927e6616a9b2105c06d789bc74c7efa6e60..3dc43c3e292724d199b973273006350a594e754e 100644
index 95ae9149cce083e1902db0a0aa7f809fea55fb05..1d61b1a375b6ab6c896940ba7d7d493e0d1e35ee 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -404,6 +404,15 @@ public final class LeavesConfig {
@@ -402,6 +402,15 @@ public final class LeavesConfig {
bborProtocol = getBoolean("settings.protocol.bbor-protocol", bborProtocol);
}

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 3dc43c3e292724d199b973273006350a594e754e..04fa3429d0725446565c01d9ae1b28193b599c4f 100644
index 1d61b1a375b6ab6c896940ba7d7d493e0d1e35ee..52304cb230a9d316e316adec86e0f7dc164c278f 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -413,6 +413,11 @@ public final class LeavesConfig {
@@ -411,6 +411,11 @@ public final class LeavesConfig {
}
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Jade Protocol
This patch is Powered by Jade(https://github.com/Snownee/Jade)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8a2d4d348953173d055426a680e9b78706cb65f8..383691cd1da59087aa7783abc13534c987fd165e 100644
index 308879d9b04aa95a83926ba795da53ce39bff5ae..b1cd3f5a0b3bd969b4414e5f48bc3c2bff2fec3f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3554,6 +3554,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -20,7 +20,7 @@ index 8a2d4d348953173d055426a680e9b78706cb65f8..383691cd1da59087aa7783abc13534c9
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 35343ab687c8841603d502386758e63fbd849932..0d5f7375a293ec8fbdd9f9d77adad07073237350 100644
index 7ee442a40b1e658d87faeefa08b2b08dee25b692..428eb52ba1e8055e27e9154c7f39977d914d7be0 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,10 +69,10 @@ 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 04fa3429d0725446565c01d9ae1b28193b599c4f..82bb440e8f724dd1310b3c068f6d4c4e5296a9aa 100644
index 52304cb230a9d316e316adec86e0f7dc164c278f..6d12088541bb511dc433c13fcc7e6ee60b06a7ab 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -418,6 +418,11 @@ public final class LeavesConfig {
@@ -416,6 +416,11 @@ public final class LeavesConfig {
flattenTriangularDistribution = getBoolean("settings.modify.flatten-triangular-distribution", flattenTriangularDistribution);
}

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Carpet alternative block placement Protocol
This patch is Powered by carpet-extra(https://github.com/gnembon/carpet-extra)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 78696fc0878f8c0996b1fb37953f6223ce37e920..7dca41e3360476b1494260e94259079d17a3a167 100644
index b1cd3f5a0b3bd969b4414e5f48bc3c2bff2fec3f..33a81ee905f8bc055c99df4df517728599038f82 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1948,7 +1948,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -78,10 +78,10 @@ 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 82bb440e8f724dd1310b3c068f6d4c4e5296a9aa..43b0083d51e8d78092595a93755ed2e1b84c4694 100644
index 6d12088541bb511dc433c13fcc7e6ee60b06a7ab..90a066960eb0a921d272ac040baf1126d640dc85 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -423,6 +423,15 @@ public final class LeavesConfig {
@@ -421,6 +421,15 @@ public final class LeavesConfig {
jadeProtocol = getBoolean("settings.protocol.jade-protocol", jadeProtocol);
}

View File

@@ -132,10 +132,10 @@ 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 43b0083d51e8d78092595a93755ed2e1b84c4694..d63907fbf908cf6c83c727889abe37058a673f6a 100644
index 90a066960eb0a921d272ac040baf1126d640dc85..9d96ca020c8b8c5d194bb5312ac7bf6d06bad03e 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -432,6 +432,11 @@ public final class LeavesConfig {
@@ -430,6 +430,11 @@ public final class LeavesConfig {
}
}

View File

@@ -40,10 +40,10 @@ 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 d63907fbf908cf6c83c727889abe37058a673f6a..86c2cdec3ebdf9af3806b82671cde2d6eab5d58d 100644
index 9d96ca020c8b8c5d194bb5312ac7bf6d06bad03e..5ae57fa9c5421940e703c02a01a061fceb7cf374 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -437,6 +437,11 @@ public final class LeavesConfig {
@@ -435,6 +435,11 @@ public final class LeavesConfig {
playerOperationLimiter = getBoolean("settings.modify.player-operation-limiter", playerOperationLimiter);
}

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 86c2cdec3ebdf9af3806b82671cde2d6eab5d58d..fc95e807a117136391406d6466aaa51159322086 100644
index 5ae57fa9c5421940e703c02a01a061fceb7cf374..ff6f7ab4c6b731dbc49caf970caad330e1db71aa 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -8,6 +8,7 @@ import org.bukkit.command.Command;
@@ -289,7 +289,7 @@ index 86c2cdec3ebdf9af3806b82671cde2d6eab5d58d..fc95e807a117136391406d6466aaa511
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@@ -442,6 +443,14 @@ public final class LeavesConfig {
@@ -440,6 +441,14 @@ public final class LeavesConfig {
renewableElytra = getDouble("settings.modify.renewable-elytra", renewableElytra);
}

View File

@@ -117,10 +117,10 @@ 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 fc95e807a117136391406d6466aaa51159322086..4113044a6ee5ce6cc33b7e13a9d8077db955aaf6 100644
index ff6f7ab4c6b731dbc49caf970caad330e1db71aa..e18f69be2311c4ce6300c8651e5230b0e2a6141d 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -451,6 +451,15 @@ public final class LeavesConfig {
@@ -449,6 +449,15 @@ public final class LeavesConfig {
shulkerBoxStackSize = Integer.parseInt(stackableShulkerBoxes);
}

View File

@@ -146,7 +146,7 @@ index e5bcbfe175a697e04886d04543e1278b7e83a184..397f8e494526fe890b8defb8a9fc3f4f
{
return config.otherTrackingRange;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 4113044a6ee5ce6cc33b7e13a9d8077db955aaf6..a42a183d0f4261638b8c4eee6a96cb6448068567 100644
index e18f69be2311c4ce6300c8651e5230b0e2a6141d..fdca60bb67c1ab574b3623ea83872608ade6951f 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;
@@ -163,7 +163,7 @@ index 4113044a6ee5ce6cc33b7e13a9d8077db955aaf6..a42a183d0f4261638b8c4eee6a96cb64
import top.leavesmc.leaves.bot.BotCommand;
import top.leavesmc.leaves.util.MathUtils;
@@ -460,6 +462,22 @@ public final class LeavesConfig {
@@ -458,6 +460,22 @@ public final class LeavesConfig {
}
}