From e0c1bb8da17c1ddc06820c6bf58778875b515b36 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 24 Mar 2018 19:30:16 -0400
Subject: [PATCH] Final kick revision (?)

---
 core/assets/version.properties                  | 2 +-
 core/src/io/anuke/mindustry/core/NetServer.java | 9 +++++++--
 core/src/io/anuke/mindustry/net/TraceInfo.java  | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index 67dc310935..68da519df1 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,5 +1,5 @@
 #Autogenerated file. Do not modify.
-#Sat Mar 24 19:17:04 EDT 2018
+#Sat Mar 24 19:29:29 EDT 2018
 version=release
 androidBuildCode=474
 name=Mindustry
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index 3dcc8e2564..dd1d6c2c38 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -172,9 +172,9 @@ public class NetServer extends Module{
             TraceInfo info = admins.getTrace(Net.getConnection(id).address);
             Weapon weapon = (Weapon)Upgrade.getByID(packet.weaponid);
 
-            float wtrc = 60f;
+            float wtrc = 60;
 
-            if(!Timers.get(info.uuid + "-weapontrace", wtrc)){
+            if(TimeUtils.millis() < info.lastFastShot + wtrc*1000){
                 info.fastShots ++;
 
                 if(info.fastShots - 10 > (int)(wtrc / (weapon.getReload() / 2f))){
@@ -182,6 +182,7 @@ public class NetServer extends Module{
                 }
             }else{
                 info.fastShots = 0;
+                info.lastFastShot = TimeUtils.millis();
             }
 
             packet.playerid = connections.get(id).id;
@@ -264,6 +265,10 @@ public class NetServer extends Module{
         });
 
         Net.handleServer(WeaponSwitchPacket.class, (id, packet) -> {
+            TraceInfo info = admins.getTrace(Net.getConnection(id).address);
+            info.fastShots = 0;
+            info.lastFastShot = TimeUtils.millis();
+
             packet.playerid = connections.get(id).id;
             Net.sendExcept(id, packet, SendMode.tcp);
         });
diff --git a/core/src/io/anuke/mindustry/net/TraceInfo.java b/core/src/io/anuke/mindustry/net/TraceInfo.java
index 940f98726f..9548ec9860 100644
--- a/core/src/io/anuke/mindustry/net/TraceInfo.java
+++ b/core/src/io/anuke/mindustry/net/TraceInfo.java
@@ -10,6 +10,7 @@ public class TraceInfo {
     public boolean android;
 
     public int fastShots;
+    public long lastFastShot;
 
     public int totalBlocksBroken;
     public int structureBlocksBroken;