5b4bc3081a
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From 858714e486e105bf61645731323132cf6059dfa0 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
Date: Mon, 27 Jan 2014 08:39:26 +1100
|
|
Subject: [PATCH] Add Optional Tick Shuffling
|
|
|
|
This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
|
|
index c2194af..1d7b814 100644
|
|
--- a/src/main/java/net/minecraft/server/ServerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/ServerConnection.java
|
|
@@ -53,6 +53,13 @@ public class ServerConnection {
|
|
List list = this.f;
|
|
|
|
synchronized (this.f) {
|
|
+ // Spigot Start
|
|
+ // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
|
|
+ if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
|
|
+ {
|
|
+ Collections.shuffle( this.f );
|
|
+ }
|
|
+ // Spigot End
|
|
Iterator iterator = this.f.iterator();
|
|
|
|
while (iterator.hasNext()) {
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 4ae5640..153fb4f 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -273,4 +273,10 @@ public class SpigotConfig
|
|
playerSample = getInt( "settings.sample-count", 12 );
|
|
System.out.println( "Server Ping Player Sample Count: " + playerSample );
|
|
}
|
|
+
|
|
+ public static int playerShuffle;
|
|
+ private static void playerShuffle()
|
|
+ {
|
|
+ playerShuffle = getInt( "settings.player-shuffle", 0 );
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|