github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 11:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added fix by JayDi for gameState().value and Lists.

Browse source
This commit is contained in:
jeffwadsworth 2021-07-31 18:16:09 -05:00
parent 73db223ca7
commit df07ad4418
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/common/AttackingCreaturePutIntoGraveyardTriggeredAbility.java
View file

@ -94,9 +94,6 @@ public class AttackingCreaturePutIntoGraveyardTriggeredAbility extends Triggered
} }
case REMOVED_FROM_COMBAT: case REMOVED_FROM_COMBAT:
// a card removed from combat is no longer an attacker or blocker so remove it from the list // a card removed from combat is no longer an attacker or blocker so remove it from the list
if (game.isSimulation()) { // a simulated game will always choose to apply any triggered effect IE: Gustcloak Savior
return false;
}
List<UUID> attackersList = (List<UUID>) game.getState().getValue(this.getSourceId() + "Attackers"); List<UUID> attackersList = (List<UUID>) game.getState().getValue(this.getSourceId() + "Attackers");
if (attackersList != null if (attackersList != null
&& attackersList.contains(event.getTargetId())) { && attackersList.contains(event.getTargetId())) {

2
Mage/src/main/java/mage/game/GameState.java
View file

@ -172,6 +172,8 @@ public class GameState implements Serializable, Copyable<GameState> {
this.values.put(entry.getKey(), ((EnumSet) entry.getValue()).clone()); this.values.put(entry.getKey(), ((EnumSet) entry.getValue()).clone());
} else if (entry.getValue() instanceof HashMap) { } else if (entry.getValue() instanceof HashMap) {
this.values.put(entry.getKey(), ((HashMap) entry.getValue()).clone()); this.values.put(entry.getKey(), ((HashMap) entry.getValue()).clone());
} else if (entry.getValue() instanceof List) {
this.values.put(entry.getKey(), ((List) entry.getValue()).stream().collect(Collectors.toList()));
} else { } else {
this.values.put(entry.getKey(), entry.getValue()); this.values.put(entry.getKey(), entry.getValue());
} }