fix for Siren's Call destroying Walls under certain conditions

This commit is contained in:
jendave
2011-08-06 06:12:40 +00:00
parent d10bffa4fc
commit c30cf4d13f

View File

@@ -5406,9 +5406,9 @@ public class CardFactory_Instants {
//skip walls, skip creatures with summoning sickness //skip walls, skip creatures with summoning sickness
//also skip creatures with haste if they came into play this turn //also skip creatures with haste if they came into play this turn
if((!creature.isWall() && !creature.hasSickness()) if((!creature.isWall() && !creature.hasSickness())
|| !(creature.getKeyword().contains("Haste") && creature.getTurnInZone() == 1)) { || (creature.getKeyword().contains("Haste") && creature.getTurnInZone() != 1)) {
creature.setSirenAttackOrDestroy(true); creature.setSirenAttackOrDestroy(true);
//System.out.println("Siren's Call - setting flag for "+creature.getName()); System.out.println("Siren's Call - setting flag for "+creature.getName());
} }
} }
Command atEOT = new Command() { Command atEOT = new Command() {
@@ -5420,11 +5420,11 @@ public class CardFactory_Instants {
CardList creatures = AllZoneUtil.getCreaturesInPlay(opponent); CardList creatures = AllZoneUtil.getCreaturesInPlay(opponent);
for(Card creature:creatures) { for(Card creature:creatures) {
//System.out.println("Siren's Call - EOT - "+creature.getName() +" flag: "+creature.getSirenAttackOrDestroy()); System.out.println("Siren's Call - EOT - "+creature.getName() +" flag: "+creature.getSirenAttackOrDestroy());
//System.out.println("Siren's Call - EOT - "+creature.getName() +" attacked?: "+creature.getCreatureAttackedThisCombat()); System.out.println("Siren's Call - EOT - "+creature.getName() +" attacked?: "+creature.getCreatureAttackedThisCombat());
if(creature.getSirenAttackOrDestroy() && !creature.getCreatureAttackedThisCombat()) { if(creature.getSirenAttackOrDestroy() && !creature.getCreatureAttackedThisCombat()) {
if(AllZone.GameAction.isCardInPlay(creature)) { if(AllZone.GameAction.isCardInPlay(creature)) {
//System.out.println("Siren's Call - destroying "+creature.getName()); System.out.println("Siren's Call - destroying "+creature.getName());
//this should probably go on the stack //this should probably go on the stack
AllZone.GameAction.destroy(creature); AllZone.GameAction.destroy(creature);
} }