From 411ea27772370b796864fd54fbc6cd499eed194f Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 5 Sep 2015 11:51:02 +0200
Subject: [PATCH] * Supend - Fixed that the haste ability lasted also if a
 creature brought into play by supend if the creature leftz and returned the
 battlefield by another effect than suspend.

---
 .../src/mage/sets/timespiral/RiftwingCloudskate.java  |  6 +++---
 Mage/src/mage/abilities/keyword/SuspendAbility.java   | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java
index 221faa6eb4d..c0fd5c60bc7 100644
--- a/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java
+++ b/Mage.Sets/src/mage/sets/timespiral/RiftwingCloudskate.java
@@ -28,8 +28,6 @@
 package mage.sets.timespiral;
 
 import java.util.UUID;
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
@@ -38,6 +36,8 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.SuspendAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.target.TargetPermanent;
 
 /**
@@ -62,7 +62,7 @@ public class RiftwingCloudskate extends CardImpl {
         this.addAbility(ability);
 
         // Suspend 3-{1}{U}
-        this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{U}"),this));
+        this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{U}"), this));
     }
 
     public RiftwingCloudskate(final RiftwingCloudskate card) {
diff --git a/Mage/src/mage/abilities/keyword/SuspendAbility.java b/Mage/src/mage/abilities/keyword/SuspendAbility.java
index 03b50951133..c5838c809d9 100644
--- a/Mage/src/mage/abilities/keyword/SuspendAbility.java
+++ b/Mage/src/mage/abilities/keyword/SuspendAbility.java
@@ -409,14 +409,11 @@ class GainHasteEffect extends ContinuousEffectImpl {
             suspendController = source.getControllerId();
         }
         Permanent permanent = game.getPermanent(source.getSourceId());
-        if (permanent != null) {
-            if (suspendController.equals(source.getControllerId())) {
-                permanent.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
-                return true;
-            } else {
-                this.discard();
-            }
+        if (permanent != null && suspendController.equals(source.getControllerId())) {
+            permanent.addAbility(HasteAbility.getInstance(), source.getSourceId(), game);
+            return true;
         }
+        this.discard();
         return false;
     }