From ac5cec5cf2a64c647a499f6e3cbb4911e2b0836d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 1 Nov 2022 01:43:42 -0400 Subject: [PATCH 1/3] Fixed menus pausing in multiplayer --- core/src/mindustry/core/Control.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 7e8e48dbeb..d5134d99a1 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -651,7 +651,9 @@ public class Control implements ApplicationListener, Loadable{ ui.chatfrag.hide(); }else if(!ui.paused.isShown() && !scene.hasDialog()){ ui.paused.show(); - state.set(State.paused); + if(!net.active()){ + state.set(State.paused); + } } } From 240c234e88a7e4ceba9c1e3c071fa8bb49e6a986 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 1 Nov 2022 01:45:05 -0400 Subject: [PATCH 2/3] Fixed #7791 --- core/src/mindustry/content/UnitTypes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 9ba51c2c6a..5945e50ed6 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -4285,6 +4285,7 @@ public class UnitTypes{ engineOffset = 6.5f; payloadCapacity = 0f; targetable = false; + bounded = false; outlineColor = Pal.darkOutline; isEnemy = false; From 68bde6f900cbe2f9ca2b8a35e666c90121439214 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 1 Nov 2022 01:49:20 -0400 Subject: [PATCH 3/3] Don't show 'waiting for players' when not paused --- core/src/mindustry/ui/fragments/HudFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 5061861bdb..bda2c93c23 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -99,7 +99,7 @@ public class HudFragment{ //"waiting for players" parent.fill(t -> { t.name = "waiting"; - t.visible(() -> netServer.isWaitingForPlayers()).touchable = Touchable.disabled; + t.visible(() -> netServer.isWaitingForPlayers() && state.isPaused() && shown).touchable = Touchable.disabled; t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(18f)); });