Upstream merge - remove movement limit

This commit is contained in:
Zach Brown 2014-07-03 23:21:36 -05:00
parent 31a917241b
commit 3709c87cb8
3 changed files with 2 additions and 39 deletions

2
Bukkit

@ -1 +1 @@
Subproject commit 5a5523015148a832f110f0e48ca71bce796edd29
Subproject commit 7c0fc96e9e10cb703190cf78124fad5ea977807a

@ -1 +1 @@
Subproject commit 32f89aac85821cc2928d3552bb12bc64ec76b14f
Subproject commit b734927224f585a1b232a3ce1decb155130eda96

View file

@ -1,37 +0,0 @@
From 52f79efa2f8217c0d3dd35f756f8165ca9a60a2c Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Thu, 3 Jul 2014 19:23:27 -0500
Subject: [PATCH] Configurable movement limit restriction
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 71878e9..c6564b6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -186,7 +186,7 @@ public class PlayerConnection implements PacketPlayInListener {
public void a(PacketPlayInFlying packetplayinflying) {
// Spigot start - throttle
- if ( ++movementPackets >= 5 )
+ if ( ++movementPackets >= PaperSpigotConfig.movementLimit ) // PaperSpigot - Configurable movement limit restriction
{
Player player = this.getPlayer();
Location curPos = player.getLocation();
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
index 7bda065..49bb6a1 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
@@ -135,4 +135,10 @@ public class PaperSpigotConfig
{
interactLimit = getInt( "settings.player-interaction-limit", 2 );
}
+
+ public static int movementLimit;
+ private static void movementLimit()
+ {
+ movementLimit = getInt( "settings.player-movement-limit", 5 );
+ }
}
--
1.9.1