mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-21 15:59:33 +00:00
May fix #25
This commit is contained in:
@@ -57,7 +57,7 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..8873e12cbd3d6f9071efedb35ea3c69c
|
|||||||
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
|
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
|
||||||
boolean flag1 = advancementprogress.isDone();
|
boolean flag1 = advancementprogress.isDone();
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
index 7d6d3c8556033d289fdadc489e73fba478fce41a..2bdd75f4e48a232d2cc7c24475caafa2ebd989b0 100644
|
index 9160725f031c9698a00229c3dfa19d39b4a826c1..5cc41baf24eed6a186620fe3bcd76410ffc11d26 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
@@ -176,6 +176,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
|
@@ -176,6 +176,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
|
||||||
@@ -165,7 +165,7 @@ index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..5a5a3f84138b2f9a55f0a7c17004194d
|
|||||||
+ // Leaves end - fakeplayer support
|
+ // Leaves end - fakeplayer support
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||||
index 61597ebe2f9faff43994c475074b87d11905e582..179d49336ec6ff0ac345a9df1c1236afa096af4c 100644
|
index 1116116e4ba6c5ecec400cd371b70b9e14efd92b..53c5c229f710da8c409bbc5adcd932ef3e848473 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||||
@@ -1283,7 +1283,7 @@ public abstract class Player extends LivingEntity {
|
@@ -1283,7 +1283,7 @@ public abstract class Player extends LivingEntity {
|
||||||
@@ -178,7 +178,7 @@ index 61597ebe2f9faff43994c475074b87d11905e582..179d49336ec6ff0ac345a9df1c1236af
|
|||||||
|
|
||||||
if (itemstack.getItem() instanceof SwordItem) {
|
if (itemstack.getItem() instanceof SwordItem) {
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||||||
index 7f3a7a769afec8449547c26453112064b9bcb04a..a31426368ec089baba958f998973cadb409bce3a 100644
|
index 15fb5ee374b19366ebb23181896fb943e95819f0..07886228e5a9536908b8480e8bf585bbbe91cb00 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||||||
@@ -61,7 +61,7 @@ public class FishingHook extends Projectile {
|
@@ -61,7 +61,7 @@ public class FishingHook extends Projectile {
|
||||||
@@ -218,7 +218,7 @@ index 78f53ee557276de85f0431ebcb146445b1f4fb92..42a2e411fd769bf0bf034141297e890c
|
|||||||
}
|
}
|
||||||
// Water Animals
|
// Water Animals
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 1fb25e8a21b568864974cc81b452ba062890d593..57567e12bab0cb7d5c59957232a2bd2a40020360 100644
|
index 1fb25e8a21b568864974cc81b452ba062890d593..746b3873782d3ee13a30b8b65b4970b140b6f0fc 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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;
|
@@ -7,6 +7,8 @@ import org.bukkit.Bukkit;
|
||||||
@@ -268,7 +268,7 @@ index 1fb25e8a21b568864974cc81b452ba062890d593..57567e12bab0cb7d5c59957232a2bd2a
|
|||||||
public static boolean playerCanEditSign = true;
|
public static boolean playerCanEditSign = true;
|
||||||
private static void playerCanEditSign() {
|
private static void playerCanEditSign() {
|
||||||
playerCanEditSign = getBoolean("settings.modify.player-can-edit-sign", playerCanEditSign);
|
playerCanEditSign = getBoolean("settings.modify.player-can-edit-sign", playerCanEditSign);
|
||||||
@@ -146,6 +162,19 @@ public final class LeavesConfig {
|
@@ -146,6 +162,21 @@ public final class LeavesConfig {
|
||||||
snowballAndEggCanKnockback = getBoolean("settings.modify.snowball-and-egg-can-knockback-player", snowballAndEggCanKnockback);
|
snowballAndEggCanKnockback = getBoolean("settings.modify.snowball-and-egg-can-knockback-player", snowballAndEggCanKnockback);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -277,12 +277,14 @@ index 1fb25e8a21b568864974cc81b452ba062890d593..57567e12bab0cb7d5c59957232a2bd2a
|
|||||||
+ public static int fakeplayerLimit = 10;
|
+ public static int fakeplayerLimit = 10;
|
||||||
+ public static String fakeplayerPrefix = "";
|
+ public static String fakeplayerPrefix = "";
|
||||||
+ public static String fakeplayerSuffix = "";
|
+ public static String fakeplayerSuffix = "";
|
||||||
|
+ public static boolean alwaysSendFakeplayerData = true;
|
||||||
+ public static void fakeplayer() {
|
+ public static void fakeplayer() {
|
||||||
+ fakeplayerSupport = getBoolean("settings.modify.fakeplayer.enable", fakeplayerSupport);
|
+ fakeplayerSupport = getBoolean("settings.modify.fakeplayer.enable", fakeplayerSupport);
|
||||||
+ unableFakeplayerNames = getList("settings.modify.fakeplayer.unable-fakeplayer-names", unableFakeplayerNames);
|
+ unableFakeplayerNames = getList("settings.modify.fakeplayer.unable-fakeplayer-names", unableFakeplayerNames);
|
||||||
+ fakeplayerLimit = getInt("settings.modify.fakeplayer.limit", fakeplayerLimit);
|
+ fakeplayerLimit = getInt("settings.modify.fakeplayer.limit", fakeplayerLimit);
|
||||||
+ fakeplayerPrefix = getString("settings.modify.fakeplayer.prefix", fakeplayerPrefix);
|
+ fakeplayerPrefix = getString("settings.modify.fakeplayer.prefix", fakeplayerPrefix);
|
||||||
+ fakeplayerSuffix = getString("settings.modify.fakeplayer.suffix", fakeplayerSuffix);
|
+ fakeplayerSuffix = getString("settings.modify.fakeplayer.suffix", fakeplayerSuffix);
|
||||||
|
+ alwaysSendFakeplayerData = getBoolean("settings.modify.fakeplayer.always-send-data", alwaysSendFakeplayerData);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static final class WorldConfig {
|
public static final class WorldConfig {
|
||||||
@@ -671,7 +673,7 @@ 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
|
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
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..9045c87582aa71970ca4b30cb777debe858c1e83
|
index 0000000000000000000000000000000000000000..4f3c5ab80f721b6cb40ea005dab47c8a60fa5416
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java
|
+++ b/src/main/java/top/leavesmc/leaves/bot/ServerBot.java
|
||||||
@@ -0,0 +1,700 @@
|
@@ -0,0 +1,700 @@
|
||||||
@@ -868,7 +870,7 @@ index 0000000000000000000000000000000000000000..9045c87582aa71970ca4b30cb777debe
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void render(ServerPlayerConnection connection, boolean login, boolean all) {
|
+ public void render(ServerPlayerConnection connection, boolean login, boolean all) {
|
||||||
+ render(connection, getRenderPackets(), login, all);
|
+ render(connection, getRenderPackets(), login, all && LeavesConfig.alwaysSendFakeplayerData);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ private void render(@NotNull ServerPlayerConnection connection, Packet<?> @NotNull [] packets, boolean login, boolean all) { // always use getRenderPackets() to get packets. replace it soon
|
+ private void render(@NotNull ServerPlayerConnection connection, Packet<?> @NotNull [] packets, boolean login, boolean all) { // always use getRenderPackets() to get packets. replace it soon
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 57567e12bab0cb7d5c59957232a2bd2a40020360..7e1f17807860847792c8a599301cc942768e0931 100644
|
index 746b3873782d3ee13a30b8b65b4970b140b6f0fc..adb206f659631537f0d42e53dc6a1c290898d508 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
@@ -104,10 +104,12 @@ public final class LeavesConfig {
|
||||||
@@ -34,8 +34,8 @@ index 57567e12bab0cb7d5c59957232a2bd2a40020360..7e1f17807860847792c8a599301cc942
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,6 +177,11 @@ public final class LeavesConfig {
|
@@ -177,6 +179,11 @@ public final class LeavesConfig {
|
||||||
fakeplayerSuffix = getString("settings.modify.fakeplayer.suffix", fakeplayerSuffix);
|
alwaysSendFakeplayerData = getBoolean("settings.modify.fakeplayer.always-send-data", alwaysSendFakeplayerData);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public static boolean shearsInDispenserCanZeroAmount = false;
|
+ public static boolean shearsInDispenserCanZeroAmount = false;
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..c9310e88b3a967cb9cacb80288e74757
|
|||||||
+ // Leaves end - shears wrench
|
+ // Leaves end - shears wrench
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 7e1f17807860847792c8a599301cc942768e0931..9517e2afa18256f6f1c7e8b670ee9012fa55ecf6 100644
|
index adb206f659631537f0d42e53dc6a1c290898d508..2cdf760ca9e1a53965e313bc9c067e9214d0b91b 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
@@ -105,11 +105,13 @@ public final class LeavesConfig {
|
||||||
@@ -115,7 +115,7 @@ index 7e1f17807860847792c8a599301cc942768e0931..9517e2afa18256f6f1c7e8b670ee9012
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,6 +184,11 @@ public final class LeavesConfig {
|
@@ -184,6 +186,11 @@ public final class LeavesConfig {
|
||||||
shearsInDispenserCanZeroAmount = getBoolean("settings.modify.shears-in-dispenser-can-zero-amount", shearsInDispenserCanZeroAmount);
|
shearsInDispenserCanZeroAmount = getBoolean("settings.modify.shears-in-dispenser-can-zero-amount", shearsInDispenserCanZeroAmount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 9517e2afa18256f6f1c7e8b670ee9012fa55ecf6..590db5dac5c78992170003498ec83b5ee531d760 100644
|
index 2cdf760ca9e1a53965e313bc9c067e9214d0b91b..fa2a3b3683b45992cea5d01376cd84fe5b668be8 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
@@ -106,12 +106,14 @@ public final class LeavesConfig {
|
||||||
@@ -39,7 +39,7 @@ index 9517e2afa18256f6f1c7e8b670ee9012fa55ecf6..590db5dac5c78992170003498ec83b5e
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,6 +191,11 @@ public final class LeavesConfig {
|
@@ -191,6 +193,11 @@ public final class LeavesConfig {
|
||||||
redstoneShearsWrench = getBoolean("settings.modify.redstone-shears-wrench", redstoneShearsWrench);
|
redstoneShearsWrench = getBoolean("settings.modify.redstone-shears-wrench", redstoneShearsWrench);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ index 8873e12cbd3d6f9071efedb35ea3c69c78033d78..1fdaa8a9993dd6881877a3b00b02487a
|
|||||||
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
|
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
|
||||||
boolean flag1 = advancementprogress.isDone();
|
boolean flag1 = advancementprogress.isDone();
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 590db5dac5c78992170003498ec83b5ee531d760..82f97f13671b0acfa43d1f2d8f4d24d10645c039 100644
|
index fa2a3b3683b45992cea5d01376cd84fe5b668be8..561a8141dcd5fba8d03afc95d0df735729ee87ee 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
@@ -107,6 +107,7 @@ public final class LeavesConfig {
|
||||||
@@ -48,7 +48,7 @@ index 590db5dac5c78992170003498ec83b5ee531d760..82f97f13671b0acfa43d1f2d8f4d24d1
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,6 +197,11 @@ public final class LeavesConfig {
|
@@ -197,6 +199,11 @@ public final class LeavesConfig {
|
||||||
private static void buddingAmethystCanPushByPiston() {
|
private static void buddingAmethystCanPushByPiston() {
|
||||||
buddingAmethystCanPushByPiston = getBoolean("settings.modify.budding-amethyst-can-push-by-piston", buddingAmethystCanPushByPiston);
|
buddingAmethystCanPushByPiston = getBoolean("settings.modify.budding-amethyst-can-push-by-piston", buddingAmethystCanPushByPiston);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ index b136cdc13d94bc34c998a1986e0c93525356ac5c..a1dd65d71606e1da07be781bf95a3268
|
|||||||
return InteractionResult.FAIL;
|
return InteractionResult.FAIL;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 82f97f13671b0acfa43d1f2d8f4d24d10645c039..4d1d7acfacc569ea376c2c519b57e368680b1656 100644
|
index 561a8141dcd5fba8d03afc95d0df735729ee87ee..3a982e2bb5b19ebdd4500d7bc651e6bf420a0e9f 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
@@ -108,6 +108,7 @@ public final class LeavesConfig {
|
||||||
@@ -41,7 +41,7 @@ index 82f97f13671b0acfa43d1f2d8f4d24d10645c039..4d1d7acfacc569ea376c2c519b57e368
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,6 +204,11 @@ public final class LeavesConfig {
|
@@ -204,6 +206,11 @@ public final class LeavesConfig {
|
||||||
private static void spectatorDontGetAdvancement() {
|
private static void spectatorDontGetAdvancement() {
|
||||||
spectatorDontGetAdvancement = getBoolean("settings.modify.spectator-dont-get-advancement", spectatorDontGetAdvancement);
|
spectatorDontGetAdvancement = getBoolean("settings.modify.spectator-dont-get-advancement", spectatorDontGetAdvancement);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ index 5a5a3f84138b2f9a55f0a7c17004194dd324ebb4..04885ae3016559e2f1cb6359ad8b558e
|
|||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 4d1d7acfacc569ea376c2c519b57e368680b1656..a3c797fd88880dd649cb0e80f472ce51614ba219 100644
|
index 3a982e2bb5b19ebdd4500d7bc651e6bf420a0e9f..0a7beccf163afa6e4cbe67cc441bb815938a2ca0 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
@@ -109,6 +109,7 @@ public final class LeavesConfig {
|
||||||
@@ -227,7 +227,7 @@ index 4d1d7acfacc569ea376c2c519b57e368680b1656..a3c797fd88880dd649cb0e80f472ce51
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,6 +211,15 @@ public final class LeavesConfig {
|
@@ -211,6 +213,15 @@ public final class LeavesConfig {
|
||||||
private static void stickChangeArmorStandHasArm() {
|
private static void stickChangeArmorStandHasArm() {
|
||||||
stickChangeArmorStandArmStatus = getBoolean("settings.modify.stick-change-armorstand-arm-status", stickChangeArmorStandArmStatus);
|
stickChangeArmorStandArmStatus = getBoolean("settings.modify.stick-change-armorstand-arm-status", stickChangeArmorStandArmStatus);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,10 +167,10 @@ index 4cdfc433df67afcd455422e9baf56f167dd712ae..a6e0f5dab21d806e0c7744b2a337cded
|
|||||||
private void ensureActiveIsNotIterated() {
|
private void ensureActiveIsNotIterated() {
|
||||||
// Paper - replace with better logic, do not delay removals
|
// 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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index a3c797fd88880dd649cb0e80f472ce51614ba219..c48c2cbe2d3fcbed78c273c36802b27dbaa2da38 100644
|
index 0a7beccf163afa6e4cbe67cc441bb815938a2ca0..e7528f6ec312dfceafec387bdc0dc3e463ede555 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -220,7 +220,16 @@ public final class LeavesConfig {
|
@@ -222,7 +222,16 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
noChatSign = getBoolean("settings.misc.no-chat-sign", noChatSign);
|
noChatSign = getBoolean("settings.misc.no-chat-sign", noChatSign);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,10 +69,10 @@ index 190e9761087baec5827d722a8281f0ffb6798341..158da4c3b002a4948bfb214337aa28a5
|
|||||||
this.entity.stopSeenByPlayer(player);
|
this.entity.stopSeenByPlayer(player);
|
||||||
player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index c48c2cbe2d3fcbed78c273c36802b27dbaa2da38..e8308375c91cdb136f1611baaf108c9078365331 100644
|
index e7528f6ec312dfceafec387bdc0dc3e463ede555..905f08e26399e017f9527af9362801f82af93b89 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -230,6 +230,11 @@ public final class LeavesConfig {
|
@@ -232,6 +232,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -174,10 +174,10 @@ index 158da4c3b002a4948bfb214337aa28a55b358fc9..2f8e77692811604fdc19bff6ba0faeea
|
|||||||
|
|
||||||
set.clear();
|
set.clear();
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index e8308375c91cdb136f1611baaf108c9078365331..6dee4f2e180f6676d4f09ea1e375fb8b4231f675 100644
|
index 905f08e26399e017f9527af9362801f82af93b89..d14adf6f7d7f465273fbf6707372fb5e33f71834 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -235,6 +235,20 @@ public final class LeavesConfig {
|
@@ -237,6 +237,20 @@ public final class LeavesConfig {
|
||||||
dontSendUselessEntityPackets = getBoolean("settings.performance.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
|
dontSendUselessEntityPackets = getBoolean("settings.performance.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ index 26bf383caea68834c654b25653ced9017f1b1b22..71e3c7fc5c071e83dfeca6954771e559
|
|||||||
this.blockPos = mutableBlockPos;
|
this.blockPos = mutableBlockPos;
|
||||||
setTargetPosition(mutableBlockPos.immutable()); // Paper
|
setTargetPosition(mutableBlockPos.immutable()); // Paper
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 6dee4f2e180f6676d4f09ea1e375fb8b4231f675..bf78a4cda81b8e1b60b4e0077657a04c49232b1a 100644
|
index d14adf6f7d7f465273fbf6707372fb5e33f71834..5978e6239dc78d7124e32a2edf04527346e51c60 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -249,6 +249,11 @@ public final class LeavesConfig {
|
@@ -251,6 +251,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,10 +38,10 @@ index 43873929f11e373186190b3ae831dc68bfa69616..2433315c13e2da90f4f208d180d487c9
|
|||||||
private Vec3 deltaMovement;
|
private Vec3 deltaMovement;
|
||||||
private float yRot;
|
private float yRot;
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index bf78a4cda81b8e1b60b4e0077657a04c49232b1a..ab3d6372712b9956d731ea273064b8e2657e5361 100644
|
index 5978e6239dc78d7124e32a2edf04527346e51c60..3c8e38dea93a9de913d1f0b7f4f5c4773ce0efc0 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -254,6 +254,12 @@ public final class LeavesConfig {
|
@@ -256,6 +256,12 @@ public final class LeavesConfig {
|
||||||
fixPaper6045 = getBoolean("settings.performance.fix.fix-paper-6045", fixPaper6045);
|
fixPaper6045 = getBoolean("settings.performance.fix.fix-paper-6045", fixPaper6045);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,10 +35,10 @@ index f577dcc95bba43a2aa8a3a54b3afbcf50e93d52b..42f89171251a5f2dcd6e75eaa1135b34
|
|||||||
public boolean hurt(DamageSource source, float amount) {
|
public boolean hurt(DamageSource source, float amount) {
|
||||||
if (this.isInvulnerableTo(source)) {
|
if (this.isInvulnerableTo(source)) {
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index ab3d6372712b9956d731ea273064b8e2657e5361..0d05fef5f9cf63dd089f46507e600e60a7f7a93b 100644
|
index 3c8e38dea93a9de913d1f0b7f4f5c4773ce0efc0..03adee1f7fc55abee6826a3bc0689a8bd75f8f18 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -259,6 +259,10 @@ public final class LeavesConfig {
|
@@ -261,6 +261,10 @@ public final class LeavesConfig {
|
||||||
optimizeEntityCoordinateKey = getBoolean("settings.performance.optimize-entity-coordinate-key", optimizeEntityCoordinateKey);
|
optimizeEntityCoordinateKey = getBoolean("settings.performance.optimize-entity-coordinate-key", optimizeEntityCoordinateKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -142,10 +142,10 @@ index 856055eeac058290b9b2146a11f5faccd1873df0..3fd487f9302f428171539e18f09f05c9
|
|||||||
return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 0d05fef5f9cf63dd089f46507e600e60a7f7a93b..90946e96453721bf060dd0b95d39ab760ce47b1d 100644
|
index 03adee1f7fc55abee6826a3bc0689a8bd75f8f18..fa65619eac5566cecb52c6723fa763071d22c243 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -264,6 +264,11 @@ public final class LeavesConfig {
|
@@ -266,6 +266,11 @@ public final class LeavesConfig {
|
||||||
enableSuffocationOptimization = getBoolean("settings.performance.enable-suffocation-optimization", enableSuffocationOptimization);
|
enableSuffocationOptimization = getBoolean("settings.performance.enable-suffocation-optimization", enableSuffocationOptimization);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,10 +45,10 @@ index 320c558bbe80d4bbc641e895ec43cfa2b45e8d70..f57572620288d8f0e024d43a4e11e212
|
|||||||
@Override
|
@Override
|
||||||
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 90946e96453721bf060dd0b95d39ab760ce47b1d..ec94bdbeac0bd9877a23f7d34d24e26b4eeb305d 100644
|
index fa65619eac5566cecb52c6723fa763071d22c243..487cd4f0013f67599de1fca5dab8e770935aaf90 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -269,6 +269,11 @@ public final class LeavesConfig {
|
@@ -271,6 +271,11 @@ public final class LeavesConfig {
|
||||||
entityStripRaytracing = getBoolean("settings.performance.strip-raytracing-for-entity", entityStripRaytracing);
|
entityStripRaytracing = getBoolean("settings.performance.strip-raytracing-for-entity", entityStripRaytracing);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize random calls in chunk ticking
|
|||||||
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
|
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
||||||
index b4e780f5b050b01ecb6b485b509235f735d71141..1f1a9af7375bdadce325f8e755a64041320db055 100644
|
index 9aa8f02adf366dc532f40a376c1cefd36a60ed5c..bec0e0b9626fb1caa96af369e048d07596d17852 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
||||||
@@ -708,6 +708,11 @@ public class ServerChunkCache extends ChunkSource {
|
@@ -708,6 +708,11 @@ public class ServerChunkCache extends ChunkSource {
|
||||||
@@ -93,10 +93,10 @@ index 28e4b302284f955a73e75d0f4276d55fb51826f5..1bf1af06fbd6501e98def7997c487c42
|
|||||||
|
|
||||||
public org.bukkit.Chunk bukkitChunk;
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index ec94bdbeac0bd9877a23f7d34d24e26b4eeb305d..b37daf01183089c021878d551ecc56be8256cc3c 100644
|
index 487cd4f0013f67599de1fca5dab8e770935aaf90..6ed61312bf9d263f4fe8e5717a6d48667b26f683 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -274,6 +274,15 @@ public final class LeavesConfig {
|
@@ -276,6 +276,15 @@ public final class LeavesConfig {
|
||||||
checkSpookySeasonOnceAnHour = getBoolean("settings.performance.check-spooky-season-once-an-hour", checkSpookySeasonOnceAnHour);
|
checkSpookySeasonOnceAnHour = getBoolean("settings.performance.check-spooky-season-once-an-hour", checkSpookySeasonOnceAnHour);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..44fc394dbab7e05a3bd7cab493300a96
|
|||||||
long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> {
|
long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> {
|
||||||
return !entry.getValue().isStillValid(time);
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index b37daf01183089c021878d551ecc56be8256cc3c..69e1cfad36ef7b5117f85a3771e4f5cc7896a5db 100644
|
index 6ed61312bf9d263f4fe8e5717a6d48667b26f683..cbfb3e1cb2cf04b6774c78ef5c76f67bf38ed39e 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -283,6 +283,11 @@ public final class LeavesConfig {
|
@@ -285,6 +285,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -29,10 +29,10 @@ index a7575b5ef56af6f53448d391abb4956e130148ca..e2764cbc888be39943728ff810e1e44b
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 69e1cfad36ef7b5117f85a3771e4f5cc7896a5db..f012ef7ed859713ed7f9dec660980d0dc1ed3b85 100644
|
index cbfb3e1cb2cf04b6774c78ef5c76f67bf38ed39e..912d86c188f6422c920e1f355a81e3ad0c21e56b 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -287,6 +287,11 @@ public final class LeavesConfig {
|
@@ -289,6 +289,11 @@ public final class LeavesConfig {
|
||||||
private static void skipPOIFindingInVehicle() {
|
private static void skipPOIFindingInVehicle() {
|
||||||
skipPOIFindingInVehicle = getBoolean("settings.performance.skip-poi-find-in-vehicle", skipPOIFindingInVehicle);
|
skipPOIFindingInVehicle = getBoolean("settings.performance.skip-poi-find-in-vehicle", skipPOIFindingInVehicle);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Use thread unsafe random for mob spawning
|
|||||||
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
|
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||||||
index 01b21f520ef1c834b9bafc3de85c1fa4fcf539d6..1a239af1c3fc254927979752d2ee18e780d17dab 100644
|
index dca0d9611593a0f3b921b314b4b458cc95f08ebc..612d536f8a1b4e45d7431dc8bbd1c7aa631a3575 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||||||
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||||||
@@ -419,12 +419,21 @@ public final class NaturalSpawner {
|
@@ -419,12 +419,21 @@ public final class NaturalSpawner {
|
||||||
@@ -38,10 +38,10 @@ index 01b21f520ef1c834b9bafc3de85c1fa4fcf539d6..1a239af1c3fc254927979752d2ee18e7
|
|||||||
|
|
||||||
public static boolean isValidEmptySpawnBlock(BlockGetter blockView, BlockPos pos, BlockState state, FluidState fluidState, EntityType<?> entityType) {
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index f012ef7ed859713ed7f9dec660980d0dc1ed3b85..a77c68ccfde65df47a1e52487397a9f2549d0eaf 100644
|
index 912d86c188f6422c920e1f355a81e3ad0c21e56b..a55d962816739265f71d691412d72c8a746e4988 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -293,6 +293,11 @@ public final class LeavesConfig {
|
@@ -295,6 +295,11 @@ public final class LeavesConfig {
|
||||||
entityTargetFindingOptimization = getBoolean("settings.performance.entity-target-find-optimization", entityTargetFindingOptimization);
|
entityTargetFindingOptimization = getBoolean("settings.performance.entity-target-find-optimization", entityTargetFindingOptimization);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index a77c68ccfde65df47a1e52487397a9f2549d0eaf..a1a80291b856098ca1f42816b34ad1d9727dee91 100644
|
index a55d962816739265f71d691412d72c8a746e4988..daaea20f6a778b1c8f35afc6bcb5734034cdba24 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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 {
|
||||||
useMoreThreadUnsafeRandom = getBoolean("settings.performance.use-more-thread-unsafe-random", useMoreThreadUnsafeRandom);
|
useMoreThreadUnsafeRandom = getBoolean("settings.performance.use-more-thread-unsafe-random", useMoreThreadUnsafeRandom);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ index 49b983064ea810382b6112f5dc7f93ba4e5710bd..3948d4c6bf1f3942b6496ee2a8876665
|
|||||||
}
|
}
|
||||||
if (this.targetSelector.inactiveTick()) {
|
if (this.targetSelector.inactiveTick()) {
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index a1a80291b856098ca1f42816b34ad1d9727dee91..d804f1a818582caa6237bb2c582899e4d15e2bd4 100644
|
index daaea20f6a778b1c8f35afc6bcb5734034cdba24..e20b518013fc6ee858b966050c8a85b29302b7ae 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -303,6 +303,11 @@ public final class LeavesConfig {
|
@@ -305,6 +305,11 @@ public final class LeavesConfig {
|
||||||
disableMethodProfiler = getBoolean("settings.misc.disable-method-profiler", disableMethodProfiler);
|
disableMethodProfiler = getBoolean("settings.misc.disable-method-profiler", disableMethodProfiler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,10 +28,10 @@ index 35f9b11a3a61976c952a2c1c64bb2a932538f54f..5d678cfca0a39aeed0881c3a38828fdc
|
|||||||
|
|
||||||
public boolean hasParam(LootContextParam<?> parameter) {
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index d804f1a818582caa6237bb2c582899e4d15e2bd4..2054ccc423cff890033f8d80cb9ee28e437927cc 100644
|
index e20b518013fc6ee858b966050c8a85b29302b7ae..0529d3254fc591a368759903a16cbd281e02518b 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -308,6 +308,11 @@ public final class LeavesConfig {
|
@@ -310,6 +310,11 @@ public final class LeavesConfig {
|
||||||
throttleInactiveGoalSelectorTick = getBoolean("settings.performance.inactive-goal-selector-disable", throttleInactiveGoalSelectorTick);
|
throttleInactiveGoalSelectorTick = getBoolean("settings.performance.inactive-goal-selector-disable", throttleInactiveGoalSelectorTick);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,10 +54,10 @@ index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..53c094c8a674b2842009727569e7e1f6
|
|||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 2054ccc423cff890033f8d80cb9ee28e437927cc..919d56eb9a0d96567eb6276bf598959227c36141 100644
|
index 0529d3254fc591a368759903a16cbd281e02518b..42b78a401f66597888bf769ddffd35a7edc337a8 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -313,6 +313,11 @@ public final class LeavesConfig {
|
@@ -315,6 +315,11 @@ public final class LeavesConfig {
|
||||||
skipCloneLootParameters = getBoolean("settings.performance.skip-clone-loot-parameters", skipCloneLootParameters);
|
skipCloneLootParameters = getBoolean("settings.performance.skip-clone-loot-parameters", skipCloneLootParameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 919d56eb9a0d96567eb6276bf598959227c36141..428afc2f7e533678445cba6c187750329e32d828 100644
|
index 42b78a401f66597888bf769ddffd35a7edc337a8..ea01d3dc4758eb26655ba15cc08a1a0d56da2c14 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -318,6 +318,11 @@ public final class LeavesConfig {
|
@@ -320,6 +320,11 @@ public final class LeavesConfig {
|
||||||
reduceEntityAllocations = getBoolean("settings.performance.reduce-entity-allocations", reduceEntityAllocations);
|
reduceEntityAllocations = getBoolean("settings.performance.reduce-entity-allocations", reduceEntityAllocations);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 428afc2f7e533678445cba6c187750329e32d828..8beeb99eb5ff087b97b60fe099c1bd6ba9ac8ea1 100644
|
index ea01d3dc4758eb26655ba15cc08a1a0d56da2c14..bc88b440d12c79f78b649ab3e6b7045c641ef3ca 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -323,6 +323,11 @@ public final class LeavesConfig {
|
@@ -325,6 +325,11 @@ public final class LeavesConfig {
|
||||||
removeTickGuardLambda = getBoolean("settings.performance.remove.tick-guard-lambda", removeTickGuardLambda);
|
removeTickGuardLambda = getBoolean("settings.performance.remove.tick-guard-lambda", removeTickGuardLambda);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,10 +68,10 @@ index 818952b1268688cf13a8ab22d38f05336bf740ad..c55eb9ef7217405c35661dbe03ae6be8
|
|||||||
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 8beeb99eb5ff087b97b60fe099c1bd6ba9ac8ea1..b3941d688d7ee9b53c5fd108463b9a1772b5b8c0 100644
|
index bc88b440d12c79f78b649ab3e6b7045c641ef3ca..a4daa3c43bc46df5f44518f457c6f49b050a8cdc 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -328,6 +328,11 @@ public final class LeavesConfig {
|
@@ -330,6 +330,11 @@ public final class LeavesConfig {
|
||||||
removeInventoryContainsIterators = getBoolean("settings.performance.remove.inventory-contains-iterators", removeInventoryContainsIterators);
|
removeInventoryContainsIterators = getBoolean("settings.performance.remove.inventory-contains-iterators", removeInventoryContainsIterators);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,10 +65,10 @@ index 634cde8069fc5ba467170a597e02da7c6b4e7b80..893475f58f649a40e3962092a3608636
|
|||||||
return this.scaledRange(i);
|
return this.scaledRange(i);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index b3941d688d7ee9b53c5fd108463b9a1772b5b8c0..dcd2f7c64e5e69bc019e711bc9da126aa856b4e1 100644
|
index a4daa3c43bc46df5f44518f457c6f49b050a8cdc..bc33a464e84c95de104b038c994f2cbe6cbc08a4 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -333,6 +333,11 @@ public final class LeavesConfig {
|
@@ -335,6 +335,11 @@ public final class LeavesConfig {
|
||||||
removeGetNearPlayerStreams = getBoolean("settings.performance.remove.get-nearby-players-streams", removeGetNearPlayerStreams);
|
removeGetNearPlayerStreams = getBoolean("settings.performance.remove.get-nearby-players-streams", removeGetNearPlayerStreams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index dcd2f7c64e5e69bc019e711bc9da126aa856b4e1..c90e7ed140ca5dae009e0c9b1823833755ddf5ab 100644
|
index bc33a464e84c95de104b038c994f2cbe6cbc08a4..b06f407f30e3f68d1ddf7b43ca4200dd14281288 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -338,6 +338,21 @@ public final class LeavesConfig {
|
@@ -340,6 +340,21 @@ public final class LeavesConfig {
|
||||||
removeRangeCheckStreams = getBoolean("settings.performance.remove.range-check-streams-and-iterators", removeRangeCheckStreams);
|
removeRangeCheckStreams = getBoolean("settings.performance.remove.range-check-streams-and-iterators", removeRangeCheckStreams);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,10 +46,10 @@ index e881584d38dc354204479863f004e974a0ac6c07..9f17c6acb54a7620656832df62e57e9d
|
|||||||
return 1; // Paper
|
return 1; // Paper
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index c90e7ed140ca5dae009e0c9b1823833755ddf5ab..d17b1ca548fa3ba8ea314d1d002418c520539582 100644
|
index b06f407f30e3f68d1ddf7b43ca4200dd14281288..810b0e32931273fa6061d06f65558d8ec2ce1b79 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -353,6 +353,11 @@ public final class LeavesConfig {
|
@@ -355,6 +355,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -102,10 +102,10 @@ index c4f1173aab1e53412a65793e06238e637910475a..44bb45b391a365d4ca4dcd7e284edbb0
|
|||||||
|
|
||||||
public boolean shouldFreeze(LevelReader world, BlockPos blockPos) {
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index d17b1ca548fa3ba8ea314d1d002418c520539582..bed3e3d7978a822897144c97d7b35985ffdc2b30 100644
|
index 810b0e32931273fa6061d06f65558d8ec2ce1b79..9e09b0cc1f6b83ba5fd6076f0e9fed70866b3b18 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -358,6 +358,15 @@ public final class LeavesConfig {
|
@@ -360,6 +360,15 @@ public final class LeavesConfig {
|
||||||
cacheClimbCheck = getBoolean("settings.performance.cache-climb-check", cacheClimbCheck);
|
cacheClimbCheck = getBoolean("settings.performance.cache-climb-check", cacheClimbCheck);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index bed3e3d7978a822897144c97d7b35985ffdc2b30..29af6e47ad830291ad97c5fe388a55dce45853da 100644
|
index 9e09b0cc1f6b83ba5fd6076f0e9fed70866b3b18..22b1a368313815d58cc04adb4e5368725bfa431f 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -367,6 +367,11 @@ public final class LeavesConfig {
|
@@ -369,6 +369,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,10 +42,10 @@ index f4002ac7cba7d5e41b4f11b98212c625f6a92a65..6feeb3d30e45c5aba4e8204fe7e76f8f
|
|||||||
boolean flag1 = iblockdata.getFluidState().is(FluidTags.WATER);
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 29af6e47ad830291ad97c5fe388a55dce45853da..165b9c7b21dd0a18e78c8bf54a841d6d5a9d5718 100644
|
index 22b1a368313815d58cc04adb4e5368725bfa431f..a4b59a56a49a7f68b137cc6bc6ae935da6a38a82 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -372,6 +372,11 @@ public final class LeavesConfig {
|
@@ -374,6 +374,11 @@ public final class LeavesConfig {
|
||||||
reduceEntityFluidLookup = getBoolean("settings.performance.reduce-entity-fluid-lookup", reduceEntityFluidLookup);
|
reduceEntityFluidLookup = getBoolean("settings.performance.reduce-entity-fluid-lookup", reduceEntityFluidLookup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 165b9c7b21dd0a18e78c8bf54a841d6d5a9d5718..3b09a5435dbbc0f878f22d6cde90eea11880961b 100644
|
index a4b59a56a49a7f68b137cc6bc6ae935da6a38a82..c46bf36a89fa2c2f1fa4fecc15ef05575fc4f2e6 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -377,6 +377,11 @@ public final class LeavesConfig {
|
@@ -379,6 +379,11 @@ public final class LeavesConfig {
|
||||||
reduceChuckLoadAndLookup = getBoolean("settings.performance.reduce-chuck-load-and-lookup", reduceChuckLoadAndLookup);
|
reduceChuckLoadAndLookup = getBoolean("settings.performance.reduce-chuck-load-and-lookup", reduceChuckLoadAndLookup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -369,10 +369,10 @@ index a4f500464de6ee6e29cff84109357364e53de233..82b588b0736f18d265c1ab269fcbd4e4
|
|||||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
// 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))
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 3b09a5435dbbc0f878f22d6cde90eea11880961b..e3081c3c7252fa779d4e81344d6446ce2d2c9423 100644
|
index c46bf36a89fa2c2f1fa4fecc15ef05575fc4f2e6..77640ca1207ac2d54b5e9badac9c5dac9bcdf021 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -382,6 +382,21 @@ public final class LeavesConfig {
|
@@ -384,6 +384,21 @@ public final class LeavesConfig {
|
||||||
simplerVanillaShapelessRecipes = getBoolean("settings.performance.simpler-vanilla-shapeless-recipes", simplerVanillaShapelessRecipes);
|
simplerVanillaShapelessRecipes = getBoolean("settings.performance.simpler-vanilla-shapeless-recipes", simplerVanillaShapelessRecipes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -95,10 +95,10 @@ index 82b588b0736f18d265c1ab269fcbd4e47509d61e..e8492a1bbf306473116974bde751b814
|
|||||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
// 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))
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index e3081c3c7252fa779d4e81344d6446ce2d2c9423..aa7462d6a0fcf138c0e637dd23a28c8b9df7ee20 100644
|
index 77640ca1207ac2d54b5e9badac9c5dac9bcdf021..5de878d654837bd1372f5ae859c2c0583af84a5c 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -397,6 +397,11 @@ public final class LeavesConfig {
|
@@ -399,6 +399,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,10 +33,10 @@ index dda31b5eea92ce3de9de0e4054ee9c7f6df631e4..dd3868045923eed8c6eaf87a57d9bf7d
|
|||||||
this.getWorldBorder().world = (ServerLevel) this;
|
this.getWorldBorder().world = (ServerLevel) this;
|
||||||
// From PlayerList.setPlayerFileData
|
// From PlayerList.setPlayerFileData
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index aa7462d6a0fcf138c0e637dd23a28c8b9df7ee20..6ddc56070fcadc67758a6da72219e07f1a26257b 100644
|
index 5de878d654837bd1372f5ae859c2c0583af84a5c..2ac7c3dea6e30d9435befbe92bb9bdfa5951e688 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -402,6 +402,15 @@ public final class LeavesConfig {
|
@@ -404,6 +404,15 @@ public final class LeavesConfig {
|
||||||
bborProtocol = getBoolean("settings.protocol.bbor-protocol", bborProtocol);
|
bborProtocol = getBoolean("settings.protocol.bbor-protocol", bborProtocol);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ index ff1ad1024419182f7f3de578442c1c033d4c9ebb..d93f3eeea17d58ccc01c6010b2d49f81
|
|||||||
|
|
||||||
default void consumeCount(int count) {
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 6ddc56070fcadc67758a6da72219e07f1a26257b..f0e925352508b55ade469cd8907390a8410b2741 100644
|
index 2ac7c3dea6e30d9435befbe92bb9bdfa5951e688..6bf431704248095eca656f9a7d3150755b6d7b85 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -411,6 +411,11 @@ public final class LeavesConfig {
|
@@ -413,6 +413,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -69,10 +69,10 @@ index e8492a1bbf306473116974bde751b814ded4b031..b69f915226dd9cda4b5f24e307d89c19
|
|||||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
// 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))
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index f0e925352508b55ade469cd8907390a8410b2741..1f416a269d683276efbff58c807dae516a7d8f3d 100644
|
index 6bf431704248095eca656f9a7d3150755b6d7b85..74838b4d190fdd42bde8486210cb8bc416cf2d08 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -416,6 +416,11 @@ public final class LeavesConfig {
|
@@ -418,6 +418,11 @@ public final class LeavesConfig {
|
||||||
flattenTriangularDistribution = getBoolean("settings.modify.flatten-triangular-distribution", flattenTriangularDistribution);
|
flattenTriangularDistribution = getBoolean("settings.modify.flatten-triangular-distribution", flattenTriangularDistribution);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Carpet alternative block placement Protocol
|
|||||||
This patch is Powered by carpet-extra(https://github.com/gnembon/carpet-extra)
|
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
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
index b1cd3f5a0b3bd969b4414e5f48bc3c2bff2fec3f..33a81ee905f8bc055c99df4df517728599038f82 100644
|
index 94a9af6f7b01677609a372371c77f11e462c7e6e..39fb3db045173d0e6779236282836be9ccf62aac 100644
|
||||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||||
+++ b/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
|
@@ -1948,7 +1948,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||||
@@ -78,10 +78,10 @@ index 7b71073027f4cf79736546500ededdfbb83d968e..085097d454869e46adafd1cff5908e39
|
|||||||
public BlockState getStateForPlacement(BlockPlaceContext ctx) {
|
public BlockState getStateForPlacement(BlockPlaceContext ctx) {
|
||||||
return this.defaultBlockState();
|
return this.defaultBlockState();
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 1f416a269d683276efbff58c807dae516a7d8f3d..bd8a724d0085adb6336339a7aba8a376c01b277e 100644
|
index 74838b4d190fdd42bde8486210cb8bc416cf2d08..2916f0f79d1c618a7cc310e27951db0456d41f94 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -421,6 +421,15 @@ public final class LeavesConfig {
|
@@ -423,6 +423,15 @@ public final class LeavesConfig {
|
||||||
jadeProtocol = getBoolean("settings.protocol.jade-protocol", jadeProtocol);
|
jadeProtocol = getBoolean("settings.protocol.jade-protocol", jadeProtocol);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
|
|||||||
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
|
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
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
index 2bdd75f4e48a232d2cc7c24475caafa2ebd989b0..fb3f205ca2d462e492ca74218a69c5b9923dfdbb 100644
|
index 5cc41baf24eed6a186620fe3bcd76410ffc11d26..b1d5e07d68a8203450a6b4c28ec863cb90017586 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
@@ -269,6 +269,10 @@ public class ServerPlayer extends Player {
|
@@ -269,6 +269,10 @@ public class ServerPlayer extends Player {
|
||||||
@@ -132,10 +132,10 @@ index 3ab714721b51b039291b8e8a4b4da5118e18f5b7..1ee9c431282851882cdc337ea01ee590
|
|||||||
return InteractionResult.FAIL;
|
return InteractionResult.FAIL;
|
||||||
} else if (!this.placeBlock(blockactioncontext1, iblockdata)) {
|
} 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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index bd8a724d0085adb6336339a7aba8a376c01b277e..4a922f5fe4eb884c4f9bbdb089b942b6af051c02 100644
|
index 2916f0f79d1c618a7cc310e27951db0456d41f94..3bfe5ff37acde23fb383197e641f944489b99df3 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -430,6 +430,11 @@ public final class LeavesConfig {
|
@@ -432,6 +432,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,10 +40,10 @@ index aa8734856ec7b90036afad13bfda46c02e548812..5d3c60c2e216848c7bbaebbd9b4f8184
|
|||||||
java.util.UUID spawningEntity;
|
java.util.UUID spawningEntity;
|
||||||
|
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 4a922f5fe4eb884c4f9bbdb089b942b6af051c02..bfc4b33ab417be30dfa5af90d0192fb6e95a1e9a 100644
|
index 3bfe5ff37acde23fb383197e641f944489b99df3..9efb1a54ee62a74ebaf5720f08b0d64d54ba3b44 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -435,6 +435,11 @@ public final class LeavesConfig {
|
@@ -437,6 +437,11 @@ public final class LeavesConfig {
|
||||||
playerOperationLimiter = getBoolean("settings.modify.player-operation-limiter", playerOperationLimiter);
|
playerOperationLimiter = getBoolean("settings.modify.player-operation-limiter", playerOperationLimiter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ index cf89cbffabf8b88265b5ffbc42b55fe617a32c82..1a9dc4afaf7dbcaf8cc46f8bdf4fa1cf
|
|||||||
if (this.add(i, stack.split(j)) && notifiesClient && this.player instanceof ServerPlayer) {
|
if (this.add(i, stack.split(j)) && notifiesClient && this.player instanceof ServerPlayer) {
|
||||||
((ServerPlayer) this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getItem(i)));
|
((ServerPlayer) this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getItem(i)));
|
||||||
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
||||||
index 95ba37458e8154dbce6a8590508840d694fcbed1..904ded08ebd12fdbec0cdd5f22a8aa04768451f5 100644
|
index 143977055717c2fe27df76231da304e2863b8f1f..a4e1e37660ae9e676a663e0fb4dff60ea923849f 100644
|
||||||
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
||||||
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
|
||||||
@@ -30,8 +30,10 @@ import net.minecraft.world.entity.SlotAccess;
|
@@ -30,8 +30,10 @@ import net.minecraft.world.entity.SlotAccess;
|
||||||
@@ -278,7 +278,7 @@ index 47468086c1cae252aa99c55b0065f225357dee62..bca757ea05403fe46f5bf0dfa75561b8
|
|||||||
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
|
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
|
||||||
return SHAPE;
|
return SHAPE;
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index bfc4b33ab417be30dfa5af90d0192fb6e95a1e9a..a61e8f71bc64f685e075578b519c0bb79d5f4d21 100644
|
index 9efb1a54ee62a74ebaf5720f08b0d64d54ba3b44..e5df1c66b69ef9304cf18677fafda180d3f0ed99 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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;
|
@@ -9,6 +9,7 @@ import org.bukkit.configuration.ConfigurationSection;
|
||||||
@@ -289,7 +289,7 @@ index bfc4b33ab417be30dfa5af90d0192fb6e95a1e9a..a61e8f71bc64f685e075578b519c0bb7
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
@@ -440,6 +441,14 @@ public final class LeavesConfig {
|
@@ -442,6 +443,14 @@ public final class LeavesConfig {
|
||||||
renewableElytra = getDouble("settings.modify.renewable-elytra", renewableElytra);
|
renewableElytra = getDouble("settings.modify.renewable-elytra", renewableElytra);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -117,10 +117,10 @@ index 0ffc131baf5c0edc4f2ca0f466fcdb20be4a47b8..4cd00673e887183f49075e5d3ba904de
|
|||||||
|
|
||||||
public abstract Fluid getFlowing();
|
public abstract Fluid getFlowing();
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index a61e8f71bc64f685e075578b519c0bb79d5f4d21..c9c8aca9210530fde712b0735b0f19347c82975c 100644
|
index e5df1c66b69ef9304cf18677fafda180d3f0ed99..39c4ba22556423cc4ef9d1cf9424ad148538f1bc 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -449,6 +449,15 @@ public final class LeavesConfig {
|
@@ -451,6 +451,15 @@ public final class LeavesConfig {
|
||||||
shulkerBoxStackSize = Integer.parseInt(stackableShulkerBoxes);
|
shulkerBoxStackSize = Integer.parseInt(stackableShulkerBoxes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ index 18eac340386a396c9850f53f30d20a41c1437788..f80ad07e5cdc937b0afbfc7d084f314e
|
|||||||
if (playerReputation != null) {
|
if (playerReputation != null) {
|
||||||
playerReputation.remove(GossipType.MAJOR_POSITIVE);
|
playerReputation.remove(GossipType.MAJOR_POSITIVE);
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||||||
index 429c54105978030f2a2275488f8f6bc0d077d312..57610e05b95d1dd911c192879f927ec090cc5411 100644
|
index 612d536f8a1b4e45d7431dc8bbd1c7aa631a3575..9e021b4b25df941b4af1fb984ad123a3211cbbe8 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||||||
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
||||||
@@ -95,7 +95,7 @@ public final class NaturalSpawner {
|
@@ -95,7 +95,7 @@ public final class NaturalSpawner {
|
||||||
@@ -83,7 +83,7 @@ index 429c54105978030f2a2275488f8f6bc0d077d312..57610e05b95d1dd911c192879f927ec0
|
|||||||
entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
|
entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
|
||||||
continue;
|
continue;
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index c9c8aca9210530fde712b0735b0f19347c82975c..7a57980a3e4dea0f0d1fe82b7ab9948719670797 100644
|
index 39c4ba22556423cc4ef9d1cf9424ad148538f1bc..b9b7f8ce2d0c2f2a5f3493e68e09e9affe3e5199 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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;
|
@@ -2,11 +2,13 @@ package top.leavesmc.leaves;
|
||||||
@@ -100,7 +100,7 @@ index c9c8aca9210530fde712b0735b0f19347c82975c..7a57980a3e4dea0f0d1fe82b7ab99487
|
|||||||
import top.leavesmc.leaves.bot.BotCommand;
|
import top.leavesmc.leaves.bot.BotCommand;
|
||||||
import top.leavesmc.leaves.bot.agent.Actions;
|
import top.leavesmc.leaves.bot.agent.Actions;
|
||||||
import top.leavesmc.leaves.util.MathUtils;
|
import top.leavesmc.leaves.util.MathUtils;
|
||||||
@@ -458,6 +460,24 @@ public final class LeavesConfig {
|
@@ -460,6 +462,24 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
|
|||||||
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
|
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
index fb3f205ca2d462e492ca74218a69c5b9923dfdbb..372beee61e982998a255a69ae1958ff021313529 100644
|
index b1d5e07d68a8203450a6b4c28ec863cb90017586..7764e261fde9374ecaa62d14966f44e6d753a449 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||||
@@ -177,6 +177,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
|
@@ -177,6 +177,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
|
||||||
@@ -133,10 +133,10 @@ index 7647b8bb3117d005dd616b29e7310f8328973b7f..eaeac639924098b86da57e2a87efc2af
|
|||||||
@Nullable
|
@Nullable
|
||||||
private DamageSource lastDamageSource;
|
private DamageSource lastDamageSource;
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 7a57980a3e4dea0f0d1fe82b7ab9948719670797..04aa52aec1770578bf02cab56d42b80b9e7104a3 100644
|
index b9b7f8ce2d0c2f2a5f3493e68e09e9affe3e5199..1dc7626a99ff42fc0c98c94bf909361f9b28b121 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -478,6 +478,11 @@ public final class LeavesConfig {
|
@@ -480,6 +480,11 @@ public final class LeavesConfig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,10 +55,10 @@ index b69f915226dd9cda4b5f24e307d89c19e739ab8b..1febe4e731356f9470020048bf78b1eb
|
|||||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
// 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))
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 04aa52aec1770578bf02cab56d42b80b9e7104a3..80a08eaa7bd83e8fb2389b36cfd3752ed7e50285 100644
|
index 1dc7626a99ff42fc0c98c94bf909361f9b28b121..18f3e74c1b0962d7a4472f48a5ac61e6f85e1ca5 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
@@ -483,6 +483,11 @@ public final class LeavesConfig {
|
@@ -485,6 +485,11 @@ public final class LeavesConfig {
|
||||||
netherPortalFix = getBoolean("settings.modify.return-nether-portal-fix", netherPortalFix);
|
netherPortalFix = getBoolean("settings.modify.return-nether-portal-fix", netherPortalFix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ index ebf9894e216b8f30ded5134c683ad68efd9c4ccd..e485b48158d65b4d47da83226f3a4ebe
|
|||||||
// CraftBukkit start - handle player weather
|
// CraftBukkit start - handle player weather
|
||||||
// entityplayer.connection.send(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.START_RAINING, 0.0F));
|
// 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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index 80a08eaa7bd83e8fb2389b36cfd3752ed7e50285..f4b8146b253482ddc73485168c30b43bc42b9456 100644
|
index 18f3e74c1b0962d7a4472f48a5ac61e6f85e1ca5..9b77b332bfca107e6cdcb5635ad3630b49a6d06e 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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;
|
@@ -20,6 +20,7 @@ import java.lang.reflect.Modifier;
|
||||||
@@ -28,7 +28,7 @@ index 80a08eaa7bd83e8fb2389b36cfd3752ed7e50285..f4b8146b253482ddc73485168c30b43b
|
|||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
// Powered by Tuinity(https://github.com/Tuinity/Tuinity)
|
// Powered by Tuinity(https://github.com/Tuinity/Tuinity)
|
||||||
@@ -488,6 +489,13 @@ public final class LeavesConfig {
|
@@ -490,6 +491,13 @@ public final class LeavesConfig {
|
||||||
appleskinProtocol = getBoolean("settings.protocol.appleskin-protocol", appleskinProtocol);
|
appleskinProtocol = getBoolean("settings.protocol.appleskin-protocol", appleskinProtocol);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ index 31faf2d6492696f7d0c99a48edbc0d6f15db1209..c7a2838157d73fa613e154aabb0d0a65
|
|||||||
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
|
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
|
||||||
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
|
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
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
index f4b8146b253482ddc73485168c30b43bc42b9456..8df4bfb5e976369194e02dea0327830d6510d09a 100644
|
index 9b77b332bfca107e6cdcb5635ad3630b49a6d06e..904410dc3f200388795de189a0a483eb236704dd 100644
|
||||||
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
||||||
+++ b/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;
|
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
@@ -42,7 +42,7 @@ index f4b8146b253482ddc73485168c30b43bc42b9456..8df4bfb5e976369194e02dea0327830d
|
|||||||
import top.leavesmc.leaves.util.MathUtils;
|
import top.leavesmc.leaves.util.MathUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -496,6 +497,18 @@ public final class LeavesConfig {
|
@@ -498,6 +499,18 @@ public final class LeavesConfig {
|
||||||
xaeroMapServerID = getInt("settings.protocol.xaero-map-server-id", xaeroMapServerID);
|
xaeroMapServerID = getInt("settings.protocol.xaero-map-server-id", xaeroMapServerID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user