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

Fixed multithreading affecting wave time

Browse Source
This commit is contained in:
Anuken
2018-05-09 16:58:53 -07:00
parent 61e9611bab
commit 26025a3018
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -153,7 +153,7 @@ project(":core") {
apply plugin: "java" apply plugin: "java"
dependencies { dependencies {
boolean comp = System.properties["release"] == null || System.properties["release"] == "false" boolean comp = false//System.properties["release"] == null || System.properties["release"] == "false"
if(!comp){ if(!comp){
println("NOTICE: Compiling release build.") println("NOTICE: Compiling release build.")

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

@@ -131,14 +131,14 @@ public class Logic extends Module {
if(!state.mode.disableWaveTimer){ if(!state.mode.disableWaveTimer){
if(state.enemies <= 0){ if(state.enemies <= 0){
if(!world.getMap().name.equals("tutorial")) state.wavetime -= delta(); if(!world.getMap().name.equals("tutorial")) state.wavetime -= Timers.delta();
if(state.lastUpdated < state.wave + 1 && state.wavetime < aheadPathfinding){ //start updating beforehand if(state.lastUpdated < state.wave + 1 && state.wavetime < aheadPathfinding){ //start updating beforehand
world.pathfinder().resetPaths(); world.pathfinder().resetPaths();
state.lastUpdated = state.wave + 1; state.lastUpdated = state.wave + 1;
} }
}else if(!world.getMap().name.equals("tutorial")){ }else if(!world.getMap().name.equals("tutorial")){
state.extrawavetime -= delta(); state.extrawavetime -= Timers.delta();
} }
} }

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,5 @@
#Thu May 03 13:02:25 EDT 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip