2015-07-21 03:14:39 +02:00
|
|
|
From 53adc0879fee781bd8d18878205950fb525ed4bb Mon Sep 17 00:00:00 2001
|
2015-01-29 22:25:50 +01:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2015-03-08 02:16:09 +01:00
|
|
|
Date: Sat, 7 Mar 2015 21:07:10 -0600
|
2014-07-11 15:17:54 +02:00
|
|
|
Subject: [PATCH] Toggle for player interact limiter
|
2014-07-03 07:57:36 +02:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2015-07-21 03:14:39 +02:00
|
|
|
index a6d8b96..52247c0 100644
|
2014-07-03 07:57:36 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
2015-07-21 03:14:39 +02:00
|
|
|
@@ -652,7 +652,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
2014-11-28 02:17:45 +01:00
|
|
|
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.u());
|
|
|
|
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
2014-07-03 07:57:36 +02:00
|
|
|
boolean throttled = false;
|
2014-07-25 05:21:57 +02:00
|
|
|
- if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
|
2014-08-06 01:45:22 +02:00
|
|
|
+ // PaperSpigot - Allow disabling the player interaction limiter
|
|
|
|
+ if (org.github.paperspigot.PaperSpigotConfig.interactLimitEnabled && lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
|
2014-07-03 07:57:36 +02:00
|
|
|
throttled = true;
|
2014-07-25 05:21:57 +02:00
|
|
|
} else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
|
2014-07-03 07:57:36 +02:00
|
|
|
{
|
|
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
|
2015-07-21 03:14:39 +02:00
|
|
|
index ae3d107..ae410b6 100644
|
2014-07-03 07:57:36 +02:00
|
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
|
|
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
|
2015-05-28 07:11:18 +02:00
|
|
|
@@ -154,4 +154,14 @@ public class PaperSpigotConfig
|
2015-03-08 02:16:09 +01:00
|
|
|
Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this is not recommended and may cause issues" );
|
2014-07-03 07:57:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
+
|
2014-07-11 15:17:54 +02:00
|
|
|
+ public static boolean interactLimitEnabled;
|
|
|
|
+ private static void interactLimitEnabled()
|
2014-07-03 07:57:36 +02:00
|
|
|
+ {
|
2014-07-11 15:17:54 +02:00
|
|
|
+ interactLimitEnabled = getBoolean( "settings.limit-player-interactions", true );
|
2015-03-08 02:16:09 +01:00
|
|
|
+ if ( !interactLimitEnabled )
|
|
|
|
+ {
|
2014-08-06 01:45:22 +02:00
|
|
|
+ Bukkit.getLogger().log( Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users" );
|
|
|
|
+ }
|
2014-07-03 07:57:36 +02:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
--
|
2015-07-21 03:14:39 +02:00
|
|
|
2.4.5.windows.1
|
2014-07-03 07:57:36 +02:00
|
|
|
|