mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 04:28:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed two major crashes

Browse Source
This commit is contained in:
Anuken 2018-02-22 20:16:55 -05:00
parent 7ee01f19fe
commit 56b3b469f6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/core/Renderer.java
View File

@ -409,8 +409,10 @@ public class Renderer extends RendererModule{
Lines.dashCircle(spawn.start.worldx(), spawn.start.worldy(), enemyspawnspace);
}
Draw.color(Color.LIME);
Lines.poly(world.getSpawnX(), world.getSpawnY(), 4, 6f, Timers.time()*2f);
if(world.getCore() != null) {
Draw.color(Color.LIME);
Lines.poly(world.getSpawnX(), world.getSpawnY(), 4, 6f, Timers.time() * 2f);
}
if(input.breakMode == PlaceMode.holdDelete)
input.breakMode.draw(tilex, tiley, 0, 0);

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

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