From c30cf4d13f4c0f0be23ffb0ec4bd24828fcb7c7f Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 06:12:40 +0000 Subject: [PATCH] fix for Siren's Call destroying Walls under certain conditions --- src/forge/CardFactory_Instants.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index a0e348984fa..bfea260ad07 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -5406,9 +5406,9 @@ public class CardFactory_Instants { //skip walls, skip creatures with summoning sickness //also skip creatures with haste if they came into play this turn if((!creature.isWall() && !creature.hasSickness()) - || !(creature.getKeyword().contains("Haste") && creature.getTurnInZone() == 1)) { + || (creature.getKeyword().contains("Haste") && creature.getTurnInZone() != 1)) { 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() { @@ -5420,11 +5420,11 @@ public class CardFactory_Instants { CardList creatures = AllZoneUtil.getCreaturesInPlay(opponent); 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() +" attacked?: "+creature.getCreatureAttackedThisCombat()); + System.out.println("Siren's Call - EOT - "+creature.getName() +" flag: "+creature.getSirenAttackOrDestroy()); + System.out.println("Siren's Call - EOT - "+creature.getName() +" attacked?: "+creature.getCreatureAttackedThisCombat()); if(creature.getSirenAttackOrDestroy() && !creature.getCreatureAttackedThisCombat()) { 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 AllZone.GameAction.destroy(creature); }