Skip to content

Fix multiplayer stuck UI when selecting entities (e.g. proliferate) #11587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shoeless wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

Fix multiplayer stuck UI when selecting entities (e.g. proliferate) #11587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class InputSelectEntitiesFromList<T extends GameEntity> extends InputSele
private final FCollectionView<T> validChoices;
protected final FCollection<T> selected = new FCollection<>();
protected Iterable<PlayerZoneUpdate> zonesShown; // want to hide these zones when input done
private PlayerZoneUpdates zonesToShow;
protected MassSelectMode massSelectMode = null;

public InputSelectEntitiesFromList(final PlayerControllerHuman controller, final int min, final int max, final FCollectionView<T> validChoices0) {
Expand All @@ -55,17 +56,13 @@ public InputSelectEntitiesFromList(final PlayerControllerHuman controller, final
}
}
getController().getGui().setSelectables(vCards, this.min, this.max);
final PlayerZoneUpdates zonesToUpdate = new PlayerZoneUpdates();
zonesToShow = new PlayerZoneUpdates();
for (final GameEntity ge : validChoices) {
final Zone cz = ge instanceof Card c ? c.getLastKnownZone() : null;
if (cz != null) {
zonesToUpdate.add(new PlayerZoneUpdate(cz.getPlayer().getView(), cz.getZoneType()));
zonesToShow.add(new PlayerZoneUpdate(cz.getPlayer().getView(), cz.getZoneType()));
}
}
FThreads.invokeInEdtNowOrLater(() -> {

@tool4ever tool4ever Aug 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmn, when I debugged this constructor being called from the game thread I still see showMessage() running before these EDT calls...

getController().getGui().updateZones(zonesToUpdate);
zonesShown = getController().getGui().tempShowZones(controller.getPlayer().getView(), zonesToUpdate);
});
}

@Override
Expand Down Expand Up @@ -167,7 +164,8 @@ else if (sa.getPayCosts().hasSpecificCostType(CostExile.class) && tally > 0) {

@Override
protected void onStop() {
getController().getGui().hideZones(getController().getPlayer().getView(),zonesShown);
// fall back to zonesToShow if the input stopped before the tempShowZones reply landed
getController().getGui().hideZones(getController().getPlayer().getView(), zonesShown != null ? zonesShown : zonesToShow);
getController().getGui().clearSelectables();
super.onStop();
}
Expand All @@ -183,6 +181,12 @@ protected void onStop() {
@Override
public void showMessage() {
super.showMessage();
// show zones after the prompt/buttons: for a remote player tempShowZones blocks on a
// round trip. EDT-only so a netty-thread refresh() can't start a second one.
if (zonesShown == null && zonesToShow != null && FThreads.isGuiThread()) {
getController().getGui().updateZones(zonesToShow);
zonesShown = getController().getGui().tempShowZones(getController().getPlayer().getView(), zonesToShow);
}
// Use mass select mode for proliferate. If you wanted to add it to a different effect
// the effect must allow you to select any number of targets between "none" and "all valid targets"
if (sa != null && ApiType.Proliferate == sa.getApi() && min == 0) {
Expand Down