From 26025a30184fc74ebd2966f882c2b0c6e404f649 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 9 May 2018 16:58:53 -0700 Subject: [PATCH] Fixed multithreading affecting wave time --- build.gradle | 2 +- core/src/io/anuke/mindustry/core/Logic.java | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2324b99895..c52f703dbb 100644 --- a/build.gradle +++ b/build.gradle @@ -153,7 +153,7 @@ project(":core") { apply plugin: "java" dependencies { - boolean comp = System.properties["release"] == null || System.properties["release"] == "false" + boolean comp = false//System.properties["release"] == null || System.properties["release"] == "false" if(!comp){ println("NOTICE: Compiling release build.") diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 72bb371d7c..cb4f484c73 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -131,14 +131,14 @@ public class Logic extends Module { if(!state.mode.disableWaveTimer){ 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 world.pathfinder().resetPaths(); state.lastUpdated = state.wave + 1; } }else if(!world.getMap().name.equals("tutorial")){ - state.extrawavetime -= delta(); + state.extrawavetime -= Timers.delta(); } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 064cb18321..be280bec02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu May 03 13:02:25 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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