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

Fixed a few more crashes

Browse Source
This commit is contained in:
Anuken
2018-02-23 15:01:32 -05:00
parent a6737c5a54
commit 2adacccf7d
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@ -88,7 +88,8 @@ public abstract class InputHandler extends InputAdapter{
public boolean validPlace(int x, int y, Block type){
for(SpawnPoint spawn : world.getSpawns()){
for(int i = 0; i < world.getSpawns().size; i ++){
SpawnPoint spawn = world.getSpawns().get(i);
if(Vector2.dst(x * tilesize, y * tilesize, spawn.start.worldx(), spawn.start.worldy()) < enemyspawnspace){
return false;
}

3
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@ -42,9 +42,6 @@ public class SettingsMenuDialog extends SettingsDialog{
shown(()->{
if(!state.is(State.menu)){
wasPaused = state.is(State.paused);
if(menu.getScene() != null){
wasPaused = ((PausedDialog)menu).wasPaused;
}
if(!Net.active()) state.set(State.paused);
ui.paused.hide();
}

7
core/src/io/anuke/mindustry/world/blocks/types/defense/LaserTurret.java
View File

@ -43,13 +43,14 @@ public class LaserTurret extends PowerTurret{
@Override
public void drawLayer2(Tile tile){
TurretEntity entity = tile.entity();
Enemy enemy = entity.target;
if(entity.target != null &&
Angles.angleDist(entity.rotation, Angles.angle(tile.drawx(), tile.drawy(), entity.target.x, entity.target.y)) <= cone){
if(enemy != null &&
Angles.angleDist(entity.rotation, Angles.angle(tile.drawx(), tile.drawy(), enemy.x, enemy.y)) <= cone){
float len = 4f;
float x = tile.drawx() + Angles.trnsx(entity.rotation, len), y = tile.drawy() + Angles.trnsy(entity.rotation, len);
float x2 = entity.target.x, y2 = entity.target.y;
float x2 = enemy.x, y2 = enemy.y;
float lighten = (MathUtils.sin(Timers.time()/1.2f) + 1f) / 10f;