From 8d731fe4c4424ebda2f6b3b74e9e27b9a5ed9de4 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 14:54:25 +0000 Subject: [PATCH] *Removed redundant runTrigger in card combat damage code. *Fixed CardsIn requirement for triggers, let's you require numbers of cards in specified zones of specified players. --- src/forge/Card.java | 7 ------- src/forge/Trigger.java | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/forge/Card.java b/src/forge/Card.java index e60987aeae7..4f39e643147 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2899,13 +2899,6 @@ public class Card extends MyObservable { if (isCreature()) GameActionUtil.executeCombatDamageToCreatureEffects(source, this, damageToAdd); GameActionUtil.executeCombatDamageEffects(source, damageToAdd); - - //Run triggers - HashMap runParams = new HashMap(); - runParams.put("DamageSource", source); - runParams.put("DamageTarget",this); - runParams.put("DamageAmount", damageToAdd); - AllZone.TriggerHandler.runTrigger("DamageDone", runParams); } map.put(source, damageToAdd); } diff --git a/src/forge/Trigger.java b/src/forge/Trigger.java index 28f82f19e5f..f5ab6d25615 100644 --- a/src/forge/Trigger.java +++ b/src/forge/Trigger.java @@ -131,7 +131,7 @@ public abstract class Trigger { if(mapParams.containsKey("CardsIn")) { - for(String OCIOper : mapParams.get("OpponentCardsIn").split(",")) + for(String OCIOper : mapParams.get("CardsIn").split(",")) { String[] splitOCIO = OCIOper.split("\\."); Player player = splitOCIO[0].equals("You") ? hostCard.getController() : hostCard.getController().getOpponent(); @@ -142,7 +142,7 @@ public abstract class Trigger { if(!Card.compare(amt,operator,operand)) { - System.out.println("Requirement failed: Required cards not present/too many cards present."); + System.out.println("Requirement failed: Required cards not present/too many cards present in specific zone."); return false; } }