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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
CCTV-1
2020-02-03 18:40:13 +08:00
parent ac58058938 6c512dd451
commit f6509dd30e
63 changed files with 462 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -377,13 +377,20 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
public Void visit(final GameEventPlayerStatsChanged event) {
final CardCollection cards = new CardCollection();
for (final Player p : event.players) {
cards.addAll(p.getAllCards());
if (event.updateCards) {
cards.addAll(p.getAllCards());
}
processPlayer(p, livesUpdate);
}
return processCards(cards, cardsRefreshDetails);
}
public Void visit(final GameEventLandPlayed event) {
processPlayer(event.player, livesUpdate);
return processCard(event.land, cardsRefreshDetails);
}
@Override
public Void visit(final GameEventTokenStateUpdate event) {
processCards(event.cards, cardsRefreshDetails);

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -30,6 +30,7 @@ import forge.game.combat.CombatUtil;
import forge.game.cost.Cost;
import forge.game.cost.CostPart;
import forge.game.cost.CostPartMana;
import forge.game.event.GameEventPlayerStatsChanged;
import forge.game.keyword.Keyword;
import forge.game.keyword.KeywordInterface;
import forge.game.mana.Mana;
@@ -1993,6 +1994,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public void setCanPlayUnlimitedLands(final boolean canPlayUnlimitedLands0) {
canPlayUnlimitedLands = canPlayUnlimitedLands0;
getGame().fireEvent(new GameEventPlayerStatsChanged(player, false));
}
/*