From fd352f4ab1471f34485de3d00b3040937bbb76cd Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 24 Mar 2018 19:19:24 -0400 Subject: [PATCH] Changed kicking again --- core/assets/version.properties | 2 +- core/src/io/anuke/mindustry/core/NetServer.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 736bc24674..67dc310935 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,5 +1,5 @@ #Autogenerated file. Do not modify. -#Sat Mar 24 18:20:40 EDT 2018 +#Sat Mar 24 19:17:04 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 9c2e3f40ef..3dcc8e2564 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -174,14 +174,13 @@ public class NetServer extends Module{ float wtrc = 60f; - if(!Timers.get(info.ip + "-weapontrace", wtrc)){ + if(!Timers.get(info.uuid + "-weapontrace", wtrc)){ info.fastShots ++; - }else{ - if(info.fastShots - 6 > (int)(wtrc / (weapon.getReload() / 2f))){ + if(info.fastShots - 10 > (int)(wtrc / (weapon.getReload() / 2f))){ kick(id, KickReason.kick); } - + }else{ info.fastShots = 0; }