Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed kicking again

Browse Source
This commit is contained in:
Anuken
2018-03-24 19:19:24 -04:00
parent 7f40247b89
commit fd352f4ab1
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/version.properties
View File

@@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sat Mar 24 18:20:40 EDT 2018 #Sat Mar 24 19:17:04 EDT 2018
version=release version=release
androidBuildCode=474 androidBuildCode=474
name=Mindustry name=Mindustry

7
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -174,14 +174,13 @@ public class NetServer extends Module{
float wtrc = 60f; float wtrc = 60f;
if(!Timers.get(info.ip + "-weapontrace", wtrc)){ if(!Timers.get(info.uuid + "-weapontrace", wtrc)){
info.fastShots ++; 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); kick(id, KickReason.kick);
} }
}else{
info.fastShots = 0; info.fastShots = 0;
} }