Bacteriawa
51 lines
4.4 KiB
Diff
51 lines
4.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
|
Date: Tue, 21 Apr 2026 23:35:48 +0800
|
|
Subject: [PATCH] Leaves: Disable moved wrongly threshold
|
|
|
|
Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54a69b6479f1959ed24a60/patches/removed/server/0099-Disable-moved-wrongly-threshold.patch)
|
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
|
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 1bd8ae7e1250a56cff636b010c371144adbb7ad0..6b0856e836f041aa8bfe274d0444d6ce3165b1ce 100644
|
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -644,7 +644,7 @@ public class ServerGamePacketListenerImpl
|
|
return;
|
|
}
|
|
// Paper end - Prevent moving into unloaded chunks
|
|
- if (movedDist - expectedDist > Math.max(100.0, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed)) && !this.isSingleplayerOwner()) {
|
|
+ if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && movedDist - expectedDist > Math.max(100.0, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed)) && !this.isSingleplayerOwner()) { // Leaves - disable can
|
|
// CraftBukkit end
|
|
LOGGER.warn(
|
|
"{} (vehicle of {}) moved too quickly! {},{},{}", vehicle.getPlainTextName(), this.player.getPlainTextName(), xDist, yDist, zDist
|
|
@@ -674,7 +674,7 @@ public class ServerGamePacketListenerImpl
|
|
zDist = targetZ - vehicle.getZ();
|
|
movedDist = xDist * xDist + yDist * yDist + zDist * zDist;
|
|
boolean fail = false;
|
|
- if (movedDist > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
|
|
+ if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && movedDist > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot // Leaves - disable can
|
|
fail = true;
|
|
LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", vehicle.getPlainTextName(), this.player.getPlainTextName(), Math.sqrt(movedDist));
|
|
}
|
|
@@ -1615,7 +1615,7 @@ public class ServerGamePacketListenerImpl
|
|
|
|
if (this.shouldCheckPlayerMovement(isFallFlying)) {
|
|
float metersPerTick = isFallFlying ? 300.0F : 100.0F;
|
|
- if (movedDist - expectedDist > Math.max(metersPerTick, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) deltaPackets * speed))) {
|
|
+ if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && movedDist - expectedDist > Math.max(metersPerTick, Mth.square(org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) deltaPackets * speed))) { // Leaves - disable can
|
|
// CraftBukkit end
|
|
// Paper start - Add fail move event
|
|
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
|
|
@@ -1676,7 +1676,8 @@ public class ServerGamePacketListenerImpl
|
|
zDist = targetZ - this.player.getZ();
|
|
movedDist = xDist * xDist + yDist * yDist + zDist * zDist;
|
|
boolean movedWrongly = false; // Paper - Add fail move event; rename
|
|
- if (!this.player.isChangingDimension()
|
|
+ if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning // Leaves - disable can
|
|
+ && !this.player.isChangingDimension()
|
|
&& movedDist > org.spigotmc.SpigotConfig.movedWronglyThreshold // Spigot
|
|
&& !this.player.isSleeping()
|
|
&& !this.player.isCreative()
|