diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index 949e40d02d..061d82c1cc 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -41,6 +41,9 @@ public class GameState{ } public void set(State astate){ + //cannot pause when in multiplayer + if(astate == State.paused && net.active()) return; + Events.fire(new StateChangeEvent(state, astate)); state = astate; } @@ -68,7 +71,7 @@ public class GameState{ } public boolean isPlaying(){ - return state == State.playing; + return (state == State.playing) || (state == State.paused && !isPaused()); } /** @return whether the current state is *not* the menu. */ diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index 860eb522d2..726e14cd8a 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -124,7 +124,7 @@ public class LaunchPad extends Block{ return Core.bundle.format("launch.destination", dest == null ? Core.bundle.get("sectors.nonelaunch") : "[accent]" + dest.name()); - }).pad(4); + }).pad(4).wrap().width(200f).left(); } @Override