From b8619292d1a25d968d889e3f721838b7d95b3b1b Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 31 Oct 2022 20:24:38 -0400 Subject: [PATCH] Multiplayer pausing as host works now --- core/src/mindustry/Vars.java | 2 -- core/src/mindustry/core/GameState.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) 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;