mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 05:26:50 +01:00
5b4bc3081a
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
38 lines
2.1 KiB
Diff
38 lines
2.1 KiB
Diff
From 49e79efebf7438701703e3d67702ae8af2f657a7 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Konrad <me@yawk.at>
|
|
Date: Tue, 22 Jul 2014 15:59:01 +0200
|
|
Subject: [PATCH] Make "moved too quickly" limit configurable
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 845fbc4..2b764b5 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -371,7 +371,8 @@ public class PlayerConnection implements PacketPlayInListener {
|
|
// CraftBukkit end
|
|
double d10 = d7 * d7 + d8 * d8 + d9 * d9;
|
|
|
|
- if (d10 > 100.0D && this.checkMovement && (!this.minecraftServer.N() || !this.minecraftServer.M().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
|
|
+ // Spigot: make "moved too quickly" limit configurable
|
|
+ if (d10 > org.spigotmc.SpigotConfig.movedTooQuicklyThreshold && this.checkMovement && (!this.minecraftServer.N() || !this.minecraftServer.M().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
|
|
c.warn(this.player.getName() + " moved too quickly! " + d4 + "," + d5 + "," + d6 + " (" + d7 + ", " + d8 + ", " + d9 + ")");
|
|
this.a(this.y, this.z, this.q, this.player.yaw, this.player.pitch);
|
|
return;
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 6a230f9..0a63291 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -339,4 +339,10 @@ public class SpigotConfig
|
|
{
|
|
movedWronglyThreshold = getDouble( "settings.moved-wrongly-threshold", 0.0625D );
|
|
}
|
|
+
|
|
+ public static double movedTooQuicklyThreshold;
|
|
+ private static void movedTooQuicklyThreshold()
|
|
+ {
|
|
+ movedTooQuicklyThreshold = getDouble( "settings.moved-too-quickly-threshold", 100.0D );
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|