diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroGameMediator.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroGameMediator.java index 6bb440f87..310fc4f09 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroGameMediator.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroGameMediator.java @@ -79,7 +79,8 @@ public class LotroGameMediator { public String getGameStatus() { if (_lotroGame.getWinnerPlayerId() != null) return "Finished"; - if (_lotroGame.getGameState().getCurrentPhase() == Phase.PLAY_STARTING_FELLOWSHIP) + final Phase currentPhase = _lotroGame.getGameState().getCurrentPhase(); + if (currentPhase == Phase.PLAY_STARTING_FELLOWSHIP || currentPhase == Phase.PUT_RING_BEARER) return "Preparation"; return "Playing"; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js index 4666c4726..1abbbec58 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/hallUi.js @@ -230,7 +230,7 @@ var GempLotrHallUI = Class.extend({ } } - if (status == "Playing") { + if (status == "Playing" || status == "Preparation") { var but = $(""); $(but).button().click( function(event) {