github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 17:00:13 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed a bug that allowed to apply damage prevention replacement effects under certain circumstances multiple times to the same event.

Browse source
This commit is contained in:
LevelX2 2014-07-31 15:16:48 +02:00
parent 84246e1935
commit 1a1fc09221
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -87,7 +87,7 @@ public class HumanPlayer extends PlayerImpl {
private static final Logger log = Logger.getLogger(HumanPlayer.class); private static final Logger log = Logger.getLogger(HumanPlayer.class);
static { static {
replacementEffectChoice.setMessage("Choose replacement effect"); replacementEffectChoice.setMessage("Choose replacement effect to resolve first");
staticOptions.put("UI.right.btn.text", "Done"); staticOptions.put("UI.right.btn.text", "Done");
} }

5
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -359,6 +359,11 @@ public class ContinuousEffects implements Serializable {
} }
} }
for (PreventionEffect effect: preventionEffects) { for (PreventionEffect effect: preventionEffects) {
if (event.getAppliedEffects() != null && event.getAppliedEffects().contains(effect.getId())) {
// Effect already applied to this event, ignore it
// TODO: Handle also gained effect that are connected to different abilities.
continue;
}
HashSet<Ability> abilities = preventionEffects.getAbility(effect.getId()); HashSet<Ability> abilities = preventionEffects.getAbility(effect.getId());
HashSet<Ability> applicableAbilities = new HashSet<>(); HashSet<Ability> applicableAbilities = new HashSet<>();
for (Ability ability : abilities) { for (Ability ability : abilities) {