From 0636d470e26d98045eed8c0907caee4851cd48fc Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Fri, 7 Jun 2019 22:08:41 -0400
Subject: [PATCH] fixed Splice onto Instant or Sorcery causing rollbacks, still
 need to fix it not working (#5830)

---
 .../mage/abilities/effects/ContinuousEffects.java     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
index 6cb9d0e7703..5d3456dc21f 100644
--- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
+++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
@@ -5,7 +5,6 @@ import mage.MageObjectReference;
 import mage.abilities.*;
 import mage.abilities.effects.common.continuous.BecomesFaceDownCreatureEffect;
 import mage.abilities.effects.common.continuous.CommanderReplacementEffect;
-import mage.abilities.keyword.SpliceOntoArcaneAbility;
 import mage.cards.Card;
 import mage.cards.Cards;
 import mage.cards.CardsImpl;
@@ -663,12 +662,12 @@ public class ContinuousEffects implements Serializable {
         }
         List<SpliceCardEffect> spliceEffects = getApplicableSpliceCardEffects(game, abilityToModify.getControllerId());
         // get the applyable splice abilities
-        List<SpliceOntoArcaneAbility> spliceAbilities = new ArrayList<>();
+        List<Ability> spliceAbilities = new ArrayList<>();
         for (SpliceCardEffect effect : spliceEffects) {
             Set<Ability> abilities = spliceCardEffects.getAbility(effect.getId());
             for (Ability ability : abilities) {
                 if (effect.applies(abilityToModify, ability, game)) {
-                    spliceAbilities.add((SpliceOntoArcaneAbility) ability);
+                    spliceAbilities.add(ability);
                 }
             }
         }
@@ -681,7 +680,7 @@ public class ContinuousEffects implements Serializable {
                 do {
                     FilterCard filter = new FilterCard("a card to splice");
                     ArrayList<Predicate<MageObject>> idPredicates = new ArrayList<>();
-                    for (SpliceOntoArcaneAbility ability : spliceAbilities) {
+                    for (Ability ability : spliceAbilities) {
                         idPredicates.add(new CardIdPredicate((ability.getSourceId())));
                     }
                     filter.add(Predicates.or(idPredicates));
@@ -689,8 +688,8 @@ public class ContinuousEffects implements Serializable {
                     controller.chooseTarget(Outcome.Benefit, target, abilityToModify, game);
                     UUID cardId = target.getFirstTarget();
                     if (cardId != null) {
-                        SpliceOntoArcaneAbility selectedAbility = null;
-                        for (SpliceOntoArcaneAbility ability : spliceAbilities) {
+                        Ability selectedAbility = null;
+                        for (Ability ability : spliceAbilities) {
                             if (ability.getSourceId().equals(cardId)) {
                                 selectedAbility = ability;
                                 break;