Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2023-11-28 08:14:01 +04:00
parent 2eac541b80
commit 1af601bf11
3 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
View file

@ -229,13 +229,12 @@ public class GameSessionPlayer extends GameSessionWatcher {
// ignore watcher
return;
}
gameView.getOpponentHands().clear();
if (!player.getPlayersUnderYourControl().isEmpty()) {
Map<String, SimpleCardsView> handCards = new HashMap<>();
for (UUID controlledPlayerId : player.getPlayersUnderYourControl()) {
Player opponent = game.getPlayer(controlledPlayerId);
handCards.put(opponent.getName(), new SimpleCardsView(opponent.getHand().getCards(game), true));
gameView.getOpponentHands().put(opponent.getName(), new SimpleCardsView(opponent.getHand().getCards(game), true));
}
gameView.setOpponentHands(handCards);
}
}

5
Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java
View file

@ -103,11 +103,10 @@ public class GameSessionWatcher {
}
protected static void processWatchedHands(Game game, UUID userId, GameView gameView) {
Map<String, SimpleCardsView> handCards = new HashMap<>();
gameView.getWatchedHands().clear();
for (Player player : game.getPlayers().values()) {
if (player.hasUserPermissionToSeeHand(userId)) {
handCards.put(player.getName(), new SimpleCardsView(player.getHand().getCards(game), true));
gameView.setWatchedHands(handCards);
gameView.getWatchedHands().put(player.getName(), new SimpleCardsView(player.getHand().getCards(game), true));
}
}
}