Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-24 01:19:19 +00:00
Code Issues Releases Activity

Disable moved wrongly threshold

Browse Source
This commit is contained in:
violetc
2023-09-28 20:35:45 +08:00
parent 8d27125f08
commit aa4c184bcf
13 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0005-Leaves-Server-Config-And-Command.patch
View File

@@ -131,10 +131,10 @@ index 07b79c811727e8a26f7c34908e9b2a6eb2fbea9e..cfdad68eb410690f57fd4ebfb1c27082
.withRequiredArg()
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..85fb668409eb3dea6c174b88654ac7db9fa020ca
index 0000000000000000000000000000000000000000..406aea18f2c54fbe9a5642c84be71a5a4dcc60f6
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -0,0 +1,1037 @@
@@ -0,0 +1,1042 @@
+package top.leavesmc.leaves;
+
+import com.destroystokyo.paper.util.SneakyThrow;
@@ -997,6 +997,11 @@ index 0000000000000000000000000000000000000000..85fb668409eb3dea6c174b88654ac7db
+ }
+ }
+
+ public static boolean disableMovedWronglyThreshold = false;
+ private static void disableMovedWronglyThreshold() {
+ disableMovedWronglyThreshold = getBoolean("settings.modify.disable-moved-wrongly-threshold", disableMovedWronglyThreshold);
+ }
+
+ public static final class WorldConfig {
+
+ public final String worldName;

2
patches/server/0010-Fakeplayer-support.patch
View File

@@ -385,7 +385,7 @@ index e932cfac619c30b8c7444a9fa41e0403a6eadf6a..8818daa3e89fd5a5b0a0ea4069ccbf0f
}
// Water Animals
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 85fb668409eb3dea6c174b88654ac7db9fa020ca..e2b7517208edeb3b646d9c8f81bf3298ddfb7def 100644
index 406aea18f2c54fbe9a5642c84be71a5a4dcc60f6..a771787615b350a10fb2261ed6f125007c8531ba 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -8,6 +8,9 @@ import org.bukkit.command.Command;

2
patches/server/0019-Optimize-mob-spawning.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize mob spawning
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index e2b7517208edeb3b646d9c8f81bf3298ddfb7def..078822107c2086f97499d386766a1ae972b3eb77 100644
index a771787615b350a10fb2261ed6f125007c8531ba..5fc621ab152c8865ce0c4519f890dd1ee7ce1a3c 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -255,7 +255,7 @@ public final class LeavesConfig {

2
patches/server/0021-Multithreaded-Tracker.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Multithreaded Tracker
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 078822107c2086f97499d386766a1ae972b3eb77..36cc925f72c850ee83a763e81c2662e67edaab71 100644
index 5fc621ab152c8865ce0c4519f890dd1ee7ce1a3c..2b94f3e3aa60b259721536f5b3bb47191df5ad92 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -269,7 +269,7 @@ public final class LeavesConfig {

2
patches/server/0036-Async-Pathfinding.patch
View File

@@ -7,7 +7,7 @@ This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
But Pufferfish patch was ported downstream from the Petal fork
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 36cc925f72c850ee83a763e81c2662e67edaab71..08550dd01eb71ef9fcb18b8b5a771cdc9cfccf97 100644
index 2b94f3e3aa60b259721536f5b3bb47191df5ad92..c2edeaaaae99e73edea11276c50e0dad3e4d3790 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -370,7 +370,7 @@ public final class LeavesConfig {

2
patches/server/0051-MC-Technical-Survival-Mode.patch
View File

@@ -109,7 +109,7 @@ index 5eded2322d604c3a304194926a740818631f36de..797725f7472ed36bf5a1369a7dfe600a
entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 08550dd01eb71ef9fcb18b8b5a771cdc9cfccf97..fccce21591136beac85a41bd1b4df3cc5569faf0 100644
index c2edeaaaae99e73edea11276c50e0dad3e4d3790..77d10a2a7a62f122cabc6dbcf959d5425eadc884 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -2,6 +2,7 @@ package top.leavesmc.leaves;

2
patches/server/0055-Leaves-Extra-Yggdrasil-Service.patch
View File

@@ -57,7 +57,7 @@ index 3f4b4d905ff440eaf4a66b10ad85933c0b07dc58..7dec27260fce938f5d1e5c437f564ed9
public final Thread serverThread;
private long nextTickTime;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index fccce21591136beac85a41bd1b4df3cc5569faf0..517e0c8d362bf6004e51109dfcb20562d00d4903 100644
index 77d10a2a7a62f122cabc6dbcf959d5425eadc884..eb4ef06074fabbf7ece7fbd49b466ba63e6ab001 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;

2
patches/server/0066-Leaves-carpet-support.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves carpet support
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 517e0c8d362bf6004e51109dfcb20562d00d4903..b10e20e7b504d15d1388fa620b8021a0652b5b3e 100644
index eb4ef06074fabbf7ece7fbd49b466ba63e6ab001..55e443a95fa85a137fb6388900084ad590a550cb 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -13,6 +13,8 @@ import top.leavesmc.leaves.bot.BotCommand;

2
patches/server/0076-No-block-update-command.patch
View File

@@ -92,7 +92,7 @@ index 2708251ebc1995e71fb0e5dca9e158a3005f8a8a..e28351b379677fec356b6efec2d882ee
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index b10e20e7b504d15d1388fa620b8021a0652b5b3e..117ab409df92a5d96568becaf58ea3a6a24c19a6 100644
index 55e443a95fa85a137fb6388900084ad590a550cb..0e445c2cbf3b590a14b01023401d8f4e87a3a182 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;

2
patches/server/0079-Bladeren-Protocol.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bladeren Protocol
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 117ab409df92a5d96568becaf58ea3a6a24c19a6..855b8b466ae6acc1d5f0367b7b8e3d64e149a7e0 100644
index 0e445c2cbf3b590a14b01023401d8f4e87a3a182..9a0e70e22116054224509fa87d8194032ed3dfb7 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -16,6 +16,8 @@ import top.leavesmc.leaves.profile.LeavesMinecraftSessionService;

2
patches/server/0109-Add-Leaves-Auto-Update.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Leaves Auto Update
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 855b8b466ae6acc1d5f0367b7b8e3d64e149a7e0..f18e1d008f0983d699869b93b1ac3d67b6c96d6e 100644
index 9a0e70e22116054224509fa87d8194032ed3dfb7..e89b4a9e87dcba180905ce0640d86bd621e48898 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -16,6 +16,7 @@ import top.leavesmc.leaves.profile.LeavesMinecraftSessionService;

2
patches/server/0121-Villager-infinite-discounts.patch
View File

@@ -21,7 +21,7 @@ index c3d1d7b525a6f2b708144ebe9bc28dfadcfe11fa..55b4386fc57286548161f9ee91e19e22
private GossipType(String key, int multiplier, int maxReputation, int decay, int shareDecrement) {
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index f18e1d008f0983d699869b93b1ac3d67b6c96d6e..fd85ceea66619935c88c26da1581349c2b4a78ed 100644
index e89b4a9e87dcba180905ce0640d86bd621e48898..f093dfc83b622f82001bcf1ed4971949c40dedf7 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -19,6 +19,7 @@ import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules;

28
patches/server/0124-Disable-moved-wrongly-threshold.patch Normal file
View File

@@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Thu, 28 Sep 2023 20:30:46 +0800
Subject: [PATCH] Disable moved wrongly threshold
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b71e01ed840fafcace0a457fa098a482004b1aeb..bdbce918c11fe2d912e246de331f6ca3e407bf5b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -577,7 +577,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
d10 = d6 * d6 + d7 * d7 + d8 * d8;
boolean flag2 = false;
- if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
+ if (!top.leavesmc.leaves.LeavesConfig.disableMovedWronglyThreshold && d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot // Leaves - disable can
flag2 = true; // Paper - diff on change, this should be moved wrongly
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
}
@@ -1460,7 +1460,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
d10 = d6 * d6 + d7 * d7 + d8 * d8;
boolean flag2 = false;
- if (!this.player.isChangingDimension() && d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
+ if (!top.leavesmc.leaves.LeavesConfig.disableMovedWronglyThreshold && !this.player.isChangingDimension() && d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot // Leaves - disable can
// Paper start - Add fail move event
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_WRONGLY,
toX, toY, toZ, toYaw, toPitch, true);