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

Fixed editor crashing with multithreading on

Browse Source
This commit is contained in:
Anuken
2018-02-10 11:14:11 -05:00
parent ff406027b0
commit 2ff4a1ee0d
3 changed files with 9 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.
#Fri Feb 09 22:22:25 EST 2018 #Sat Feb 10 11:08:25 EST 2018
version=beta version=beta
androidBuildCode=143 androidBuildCode=143
name=Mindustry name=Mindustry

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

@ -364,6 +364,10 @@ public class Control extends Module{
tutorial.update(); tutorial.update();
} }
} }
}else{
if(!state.is(State.paused) || Net.active()){
Timers.update();
}
} }
} }

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

@ -110,12 +110,12 @@ public class Logic extends Module {
@Override @Override
public void update(){ public void update(){
if(!state.is(State.paused) || Net.active()){
Timers.update();
}
if(!state.is(State.menu)){ if(!state.is(State.menu)){
if(!state.is(State.paused) || Net.active()){
Timers.update();
}
if(!Net.client()) if(!Net.client())
world.pathfinder().update(); world.pathfinder().update();