external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Removed one more portion of the now-unused DamageDone|OnlyOnce code which would crash Forge.

Browse Source
This commit is contained in:
Agetian
2017-09-25 11:13:30 +00:00
parent 966db8af9f
commit 917c6b7c54
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-game/src/main/java/forge/game/combat/Combat.java
View File

@@ -818,12 +818,6 @@ public class Combat {
runParams.put("DamageAmount", totalDmg); runParams.put("DamageAmount", totalDmg);
runParams.put("DamageTarget", ge); runParams.put("DamageTarget", ge);
ge.getGame().getTriggerHandler().runTrigger(TriggerType.CombatDamageDoneOnce, runParams, false); 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); preventMap.triggerPreventDamage(true);
@@ -848,11 +842,6 @@ public class Combat {
runParams.put("DamageAmount", dealtDamage); runParams.put("DamageAmount", dealtDamage);
damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DealtCombatDamageOnce, runParams, false); 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); damageSource.getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
} }