external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cards in hand being hidden when proceeding to second game

Browse Source
This commit is contained in:
tool4EvEr
2021-12-26 22:36:21 +01:00
parent 9d40201137
commit c35798eac8
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -517,7 +517,7 @@ public class CardView extends GameEntityView {
} }
break; break;
case Hand: case Hand:
if (controller == viewer) { if (controller.equals(viewer)) {
return true; return true;
} }
break; break;

10
forge-gui/src/main/java/forge/gamemodes/match/AbstractGuiGame.java
View File

@@ -156,8 +156,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
if (gameController == null) { if (gameController == null) {
if (originalGameControllers.containsKey(player)) { if (originalGameControllers.containsKey(player)) {
gameControllers.put(player, originalGameControllers.get(player)); gameControllers.put(player, originalGameControllers.get(player));
} } else {
else {
gameControllers.remove(player); gameControllers.remove(player);
autoPassUntilEndOfTurn.remove(player); autoPassUntilEndOfTurn.remove(player);
final PlayerView currentPlayer = getCurrentPlayer(); final PlayerView currentPlayer = getCurrentPlayer();
@@ -763,19 +762,18 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
final String yesButtonText, final String noButtonText) { final String yesButtonText, final String noButtonText) {
return showConfirmDialog(message, title, yesButtonText, noButtonText, true); return showConfirmDialog(message, title, yesButtonText, noButtonText, true);
} }
@Override @Override
public void notifyStackAddition(GameEventSpellAbilityCast event) { public void notifyStackAddition(GameEventSpellAbilityCast event) {
} }
@Override @Override
public void notifyStackRemoval(GameEventSpellRemovedFromStack event) { public void notifyStackRemoval(GameEventSpellRemovedFromStack event) {
} }
@Override @Override
public void handleLandPlayed(Card land) { public void handleLandPlayed(Card land) {
} }
@Override @Override
public void afterGameEnd() { public void afterGameEnd() {