diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 885ff05c36..00a447740d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -83,7 +83,7 @@ public class MendProjector extends Block{ for(int x = -tileRange + tile.x; x <= tileRange + tile.x; x++){ for(int y = -tileRange + tile.y; y <= tileRange + tile.y; y++){ - if(Mathf.dst(x, y, tile.x, tile.y) > realRange) continue; + if(Mathf.dst(x, y, tile.x, tile.y) > tileRange) continue; Tile other = world.tile(x, y); @@ -125,7 +125,7 @@ public class MendProjector extends Block{ Draw.alpha(1f); Lines.stroke((2f * f + 0.2f)* entity.heat); - Lines.circle(tile.drawx(), tile.drawy(), (1f-f) * 9f); + Lines.circle(tile.drawx(), tile.drawy(), ((1f-f) * 8f) * size/2f); Draw.reset(); } diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 9888cb6468..6b5664fe0d 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -5,7 +5,6 @@ import io.anuke.arc.Core; import io.anuke.arc.Events; import io.anuke.arc.collection.Array; import io.anuke.arc.collection.ObjectSet; -import io.anuke.mindustry.entities.Effects; import io.anuke.arc.files.FileHandle; import io.anuke.arc.util.*; import io.anuke.arc.util.CommandHandler.Command; @@ -13,6 +12,7 @@ import io.anuke.arc.util.CommandHandler.Response; import io.anuke.arc.util.CommandHandler.ResponseType; import io.anuke.arc.util.Timer.Task; import io.anuke.mindustry.core.GameState.State; +import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.EventType.GameOverEvent; @@ -308,7 +308,7 @@ public class ServerControl implements ApplicationListener{ handler.register("difficulty", "", "Set game difficulty.", arg -> { try{ - state.rules.waveSpacing = Difficulty.valueOf(arg[0]).waveTime; + state.rules.waveSpacing = Difficulty.valueOf(arg[0]).waveTime * 60 * 60 * 2; info("Difficulty set to '{0}'.", arg[0]); }catch(IllegalArgumentException e){ err("No difficulty with name '{0}' found.", arg[0]); @@ -692,6 +692,7 @@ public class ServerControl implements ApplicationListener{ info("&lcOpened a server on port {0}.", Core.settings.getInt("port")); }catch(BindException e){ Log.err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network."); + state.set(State.menu); }catch(IOException e){ err(e); state.set(State.menu);