Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed "waiting for players"

Browse Source
This commit is contained in:
Anuken
2022-04-22 14:30:09 -04:00
parent 8212d441c2
commit eb12c64f07
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -90,12 +90,19 @@ public class HudFragment{
//paused table //paused table
parent.fill(t -> { parent.fill(t -> {
t.name = "paused"; t.name = "paused";
t.top().visible(() -> state.isPaused() && shown).touchable = Touchable.disabled; t.top().visible(() -> state.isPaused() && shown && !netServer.isWaitingForPlayers()).touchable = Touchable.disabled;
t.table(Styles.black6, top -> top.label(() -> netServer.isWaitingForPlayers() ? "@waiting.players" : state.gameOver && state.isCampaign() ? "@sector.curlost" : "@paused") t.table(Styles.black6, top -> top.label(() -> state.gameOver && state.isCampaign() ? "@sector.curlost" : "@paused")
.style(Styles.outlineLabel).pad(8f)).height(pauseHeight).growX(); .style(Styles.outlineLabel).pad(8f)).height(pauseHeight).growX();
//.padLeft(dsize * 5 + 4f) to prevent alpha overlap on left //.padLeft(dsize * 5 + 4f) to prevent alpha overlap on left
}); });
//"waiting for players"
parent.fill(t -> {
t.name = "waiting";
t.visible(() -> netServer.isWaitingForPlayers()).touchable = Touchable.disabled;
t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(16f));
});
//minimap + position //minimap + position
parent.fill(t -> { parent.fill(t -> {
t.name = "minimap/position"; t.name = "minimap/position";
@@ -283,7 +290,7 @@ public class HudFragment{
t.name = "coreinfo"; t.name = "coreinfo";
t.collapser(v -> v.add().height(pauseHeight), () -> state.isPaused()).row(); t.collapser(v -> v.add().height(pauseHeight), () -> state.isPaused() && !netServer.isWaitingForPlayers()).row();
t.table(c -> { t.table(c -> {
//core items //core items