From c54df7cbd1e8e62015e601343fd7d7218b94dd7c Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 28 Mar 2018 00:22:07 -0400 Subject: [PATCH] Fixed host bug, server failing to kick people firing too fast --- build.gradle | 2 +- core/assets/version.properties | 4 ++-- core/src/io/anuke/mindustry/core/NetServer.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 30ab95a1b0..ac5295027d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = '238babe' + uCoreVersion = 'a4f1863' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/version.properties b/core/assets/version.properties index 68da519df1..244390133a 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Sat Mar 24 19:29:29 EDT 2018 +#Wed Mar 28 00:20:39 EDT 2018 version=release -androidBuildCode=474 +androidBuildCode=476 name=Mindustry code=3.5 build=35 diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index dd1d6c2c38..828f58a3cd 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -174,10 +174,10 @@ public class NetServer extends Module{ float wtrc = 60; - if(TimeUtils.millis() < info.lastFastShot + wtrc*1000){ + if(TimeUtils.millis() < info.lastFastShot + (int)(wtrc/60f*1000)){ info.fastShots ++; - if(info.fastShots - 10 > (int)(wtrc / (weapon.getReload() / 2f))){ + if(info.fastShots - 6 > (int)(wtrc / (weapon.getReload() / 2f))){ kick(id, KickReason.kick); } }else{