mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-26 07:37:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed host bug, server failing to kick people firing too fast

Browse Source
This commit is contained in:
Anuken
2018-03-28 00:22:07 -04:00
parent e0c1bb8da1
commit c54df7cbd1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -25,7 +25,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = '238babe' uCoreVersion = 'a4f1863'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sat Mar 24 19:29:29 EDT 2018 #Wed Mar 28 00:20:39 EDT 2018
version=release version=release
androidBuildCode=474 androidBuildCode=476
name=Mindustry name=Mindustry
code=3.5 code=3.5
build=35 build=35

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

@ -174,10 +174,10 @@ public class NetServer extends Module{
float wtrc = 60; float wtrc = 60;
if(TimeUtils.millis() < info.lastFastShot + wtrc*1000){ if(TimeUtils.millis() < info.lastFastShot + (int)(wtrc/60f*1000)){
info.fastShots ++; info.fastShots ++;
if(info.fastShots - 10 > (int)(wtrc / (weapon.getReload() / 2f))){ if(info.fastShots - 6 > (int)(wtrc / (weapon.getReload() / 2f))){
kick(id, KickReason.kick); kick(id, KickReason.kick);
} }
}else{ }else{