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

Merge branch 'push_down_toStringMap_part_1' into 'master'

Browse Source 
Push down toStringMap part 1

See merge request core-developers/forge!2127
This commit is contained in:
swordshine
2019-09-18 10:48:34 +00:00
parent 158b1d0f59 8a160c88d0
commit 4fe155959e
93 changed files with 679 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import forge.deck.DeckSection;
import forge.events.UiEventNextGameDecision;
import forge.game.*;
import forge.game.ability.AbilityFactory;
import forge.game.ability.AbilityKey;
import forge.game.ability.ApiType;
import forge.game.ability.effects.CharmEffect;
import forge.game.card.*;
@@ -631,15 +632,15 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
"CARDNAME", regtrig.getHostCard().getName()));
buildQuestion.append(")");
}
final Map<String, Object> tos = sa.getTriggeringObjects();
if (tos.containsKey("Attacker")) {
buildQuestion.append("\nAttacker: ").append(tos.get("Attacker"));
final Map<AbilityKey, Object> tos = sa.getTriggeringObjects();
if (tos.containsKey(AbilityKey.Attacker)) {
buildQuestion.append("\nAttacker: ").append(tos.get(AbilityKey.Attacker));
}
if (tos.containsKey("Card")) {
final Card card = (Card) tos.get("Card");
if (tos.containsKey(AbilityKey.Card)) {
final Card card = (Card) tos.get(AbilityKey.Card);
if (card != null && (card.getController() == player || game.getZoneOf(card) == null
|| game.getZoneOf(card).getZoneType().isKnown())) {
buildQuestion.append("\nTriggered by: ").append(tos.get("Card"));
buildQuestion.append("\nTriggered by: ").append(tos.get(AbilityKey.Card));
}
}