diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 216dba2c3d..4abe276b01 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -115,8 +115,6 @@ public class Vars implements Loadable{ public static final float iconXLarge = 8*6f, iconLarge = 8*5f, iconMed = 8*4f, iconSmall = 8*3f; /** for map generator dialog */ public static boolean updateEditorOnChange = false; - /** Experimental flag for multiplayer pausing. DO NOT USE YET! */ - public static boolean multiplayerPausing = false; /** all choosable player colors in join/host dialog */ public static final Color[] playerColors = { Color.valueOf("82759a"), diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index 0df3b4573d..cb7c29b469 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -52,11 +52,11 @@ public class GameState{ public void set(State astate){ //horrible horrible horrible - if(astate == State.paused && net.active() && multiplayerPausing) serverPaused = true; - if(astate != State.paused && net.active() && multiplayerPausing) serverPaused = false; + if(astate == State.paused && net.active() && !headless) serverPaused = true; + if(astate != State.paused && net.active() && !headless) serverPaused = false; //cannot pause when in multiplayer - if(astate == State.paused && (net.active())) return; + if(astate == State.paused && net.active()) return; Events.fire(new StateChangeEvent(state, astate)); state = astate;