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

Fixed rare server crash

Browse Source
This commit is contained in:
Anuken
2018-02-10 22:41:37 -05:00
parent a496c8ae3e
commit ef4a7a8fea
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
View File

@@ -99,6 +99,8 @@ public class EnemyType {
enemy.hitTime -= Timers.delta(); enemy.hitTime -= Timers.delta();
} }
if(enemy.lane >= world.getSpawns().size) enemy.lane = 0;
boolean waiting = world.getSpawns().get(enemy.lane).pathTiles == null || enemy.node <= 0; boolean waiting = world.getSpawns().get(enemy.lane).pathTiles == null || enemy.node <= 0;
move(enemy); move(enemy);

2
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -218,6 +218,8 @@ public class ServerControl extends Module {
try{ try{
mode = ShuffleMode.valueOf(arg[0]); mode = ShuffleMode.valueOf(arg[0]);
Settings.putString("shufflemode", arg[0]);
Settings.save();
info("Shuffle mode set to '{0}'.", arg[0]); info("Shuffle mode set to '{0}'.", arg[0]);
}catch (Exception e){ }catch (Exception e){
err("Unknown shuffle mode '{0}'.", arg[0]); err("Unknown shuffle mode '{0}'.", arg[0]);