From c322b9adad0f3c14f9cb502df1a86643d3f73403 Mon Sep 17 00:00:00 2001
From: emerald000 <emerald000@hotmail.com>
Date: Mon, 11 Jul 2016 22:28:24 -0400
Subject: [PATCH] [EMN] Fixed melding not working after the meld pieces return
 to the battlefield.

Such as returning from under an Oblivion Ring.
---
 Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
index 54e6926dcc..9cf9bf5719 100644
--- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
@@ -69,10 +69,10 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
     @Override
     public void trigger(Game game, UUID controllerId) {
         //20091005 - 603.4
+        if (!(this instanceof DelayedTriggeredAbility)) {
+            setSourceObject(null, game);
+        }
         if (checkInterveningIfClause(game)) {
-            if (!(this instanceof DelayedTriggeredAbility)) {
-                setSourceObject(null, game);
-            }
             game.addTriggeredAbility(this);
         }
     }