39 lines
2.3 KiB
Diff
39 lines
2.3 KiB
Diff
From 1fb16f928836f17ffa517b01c58cd508a1d7f120 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 3fe7038..ccb21ed 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -390,7 +390,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
|
double d14 = this.player.motX * this.player.motX + this.player.motY * this.player.motY + this.player.motZ * this.player.motZ;
|
|
double d15 = d11 * d11 + d12 * d12 + d13 * d13;
|
|
|
|
- if (d15 - d14 > 100.0D && this.checkMovement && (!this.minecraftServer.T() || !this.minecraftServer.S().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 (d15 - d14 > org.spigotmc.SpigotConfig.movedTooQuicklyThreshold && this.checkMovement && (!this.minecraftServer.T() || !this.minecraftServer.S().equals(this.player.getName()))) { // CraftBukkit - Added this.checkMovement condition to solve this check being triggered by teleports
|
|
PlayerConnection.c.warn(this.player.getName() + " moved too quickly! " + d11 + "," + d12 + "," + d13 + " (" + d11 + ", " + d12 + ", " + d13 + ")");
|
|
this.a(this.o, this.p, 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 7e774f2..2a23a4e 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -340,4 +340,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.0.msysgit.0
|
|
|