Fix missing trigger due to ETB with old state

This commit is contained in:
TRT
2021-10-12 17:13:53 +02:00
parent e224d8790d
commit fa9dd99f6e

View File

@@ -24,12 +24,16 @@ public class StaticAbilityPanharmonicon {
int n = 0; int n = 0;
CardCollectionView cardList = null; CardCollectionView cardList = null;
// currently only used for leave the battlefield trigger // if LTB look back
if (t.getMode() == TriggerType.ChangesZone && "Battlefield".equals(t.getParam("Origin"))) {
if (runParams.containsKey(AbilityKey.LastStateBattlefield)) { if (runParams.containsKey(AbilityKey.LastStateBattlefield)) {
cardList = (CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield); cardList = (CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield);
} }
if (cardList == null) { if (cardList == null) {
cardList = t.getMode() == TriggerType.ChangesZone && "Battlefield".equals(t.getParam("Origin")) ? game.getLastStateBattlefield() : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES); cardList = game.getLastStateBattlefield();
}
} else {
cardList = game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES);
} }
// Checks only the battlefield, as those effects only work from there // Checks only the battlefield, as those effects only work from there