From 917c6b7c54ff15b1696aa773031a2eae90103fc1 Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 25 Sep 2017 11:13:30 +0000 Subject: [PATCH] - Removed one more portion of the now-unused DamageDone|OnlyOnce code which would crash Forge. --- .../src/main/java/forge/game/combat/Combat.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index 275f689233a..93d15433a99 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -818,12 +818,6 @@ public class Combat { runParams.put("DamageAmount", totalDmg); runParams.put("DamageTarget", ge); ge.getGame().getTriggerHandler().runTrigger(TriggerType.CombatDamageDoneOnce, runParams, false); - - // also fire DamageDone with the same runParams but with OnlyOnce applied - // for cards that are interested in such triggers - runParams.put("IsCombatDamage", true); - runParams.put("CombatDamageOnce", true); - ge.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false); } preventMap.triggerPreventDamage(true); @@ -848,11 +842,6 @@ public class Combat { runParams.put("DamageAmount", dealtDamage); damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DealtCombatDamageOnce, runParams, false); - // also fire DamageDone with the same runParams but with OnlyOnce applied - // for cards that are interested in such triggers - runParams.put("IsCombatDamage", true); - runParams.put("CombatDamageOnce", true); - damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false); }