From 3572cbdc87f07fc7069fa7dd2dd278e3ed1fd106 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 29 Jun 2013 20:50:13 +0200 Subject: [PATCH] * Slice onto arcane - Fixed a bug that splice cards of opponents were counted as own splice cards. Leading to lock down the client. --- Mage/src/mage/abilities/effects/ContinuousEffects.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java index 0cc5102bfc..88cd165bd1 100644 --- a/Mage/src/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java @@ -351,13 +351,13 @@ public class ContinuousEffects implements Serializable { * @param game * @return */ - private List getApplicableSpliceCardEffects(Game game) { + private List getApplicableSpliceCardEffects(Game game, UUID playerId) { List spliceEffects = new ArrayList(); for (SpliceCardEffect effect: spliceCardEffects) { HashSet abilities = spliceCardEffects.getAbility(effect.getId()); for (Ability ability : abilities) { - if (!(ability instanceof StaticAbility) || ability.isInUseableZone(game, null, false)) { + if (ability.getControllerId().equals(playerId) && (!(ability instanceof StaticAbility) || ability.isInUseableZone(game, null, false))) { if (effect.getDuration() != Duration.OneUse || !effect.isUsed()) { spliceEffects.add(effect); break; @@ -442,7 +442,7 @@ public class ContinuousEffects implements Serializable { // on a spliced ability of a spell can't be spliced again return; } - List spliceEffects = getApplicableSpliceCardEffects(game); + List spliceEffects = getApplicableSpliceCardEffects(game, abilityToModify.getControllerId()); // get the applyable splice abilities List spliceAbilities = new ArrayList(); for (SpliceCardEffect effect : spliceEffects) {