From c183b2dac4f9313d16cd923203a5aff414b3ee2e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 7 Jan 2020 15:54:51 -0500
Subject: [PATCH] Fixed incorrect variable usage

---
 core/src/mindustry/core/NetServer.java     | 6 ++++++
 core/src/mindustry/net/Administration.java | 8 ++++----
 gradle.properties                          | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 55a286b080..183bd02238 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -413,6 +413,12 @@ public class NetServer implements ApplicationListener{
             if(player.isLocal){
                 player.sendMessage("[scarlet]Re-synchronizing as the host is pointless.");
             }else{
+                if(Time.timeSinceMillis(player.getInfo().lastSyncTime) < 1000 * 5){
+                    player.sendMessage("[scarlet]You may only /sync every 5 seconds.");
+                    return;
+                }
+
+                player.getInfo().lastSyncTime = Time.millis();
                 Call.onWorldDataBegin(player.con);
                 netServer.sendWorldData(player);
             }
diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
index a5573afad8..47979cb2a5 100644
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -34,19 +34,19 @@ public class Administration{
                     if(player.getInfo().messageInfractions >= Config.messageSpamKick.num() && Config.messageSpamKick.num() != 0){
                         player.con.kick("You have been kicked for spamming.", 1000 * 60 * 2);
                     }
-                    player.lastText = message;
+                    player.getInfo().lastSentMessage = message;
                     return null;
                 }else{
                     player.getInfo().messageInfractions = 0;
                 }
 
                 //prevent players from sending the same message twice in the span of 50 seconds
-                if(message.equals(player.lastText) && Time.timeSinceMillis(player.getInfo().lastMessageTime) < 1000 * 50){
+                if(message.equals(player.getInfo().lastSentMessage) && Time.timeSinceMillis(player.getInfo().lastMessageTime) < 1000 * 50){
                     player.sendMessage("[scarlet]You may not send the same message twice.");
                     return null;
                 }
 
-                player.lastText = message;
+                player.getInfo().lastSentMessage = message;
                 player.getInfo().lastMessageTime = Time.millis();
             }
 
@@ -440,7 +440,7 @@ public class Administration{
         public boolean banned, admin;
         public long lastKicked; //last kicked time to expiration
 
-        public transient long lastMessageTime;
+        public transient long lastMessageTime, lastSyncTime;
         public transient String lastSentMessage;
         public transient int messageInfractions;
 
diff --git a/gradle.properties b/gradle.properties
index 052fc80569..ecc45979db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=9f70d5a39a910bd855430d74e41d0b8753b47442
+archash=dbdce4d5bfcf9d53dd21480c7d14e90a637eaa8e