From d2b252b517cf5828f5719e16ca315664fae8d5eb Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 10 Sep 2014 00:18:49 +0200
Subject: [PATCH] * Gemstone Mine - Fixed that it did not produce mana anymore.

---
 Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java  | 10 ++--------
 .../abilities/decorator/ConditionalOneShotEffect.java  |  8 ++++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
index fbd060f8f0e..ab0701cce46 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
@@ -28,11 +28,7 @@
 package mage.sets.timeshifted;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.StateTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.common.SourceHasCounterCondition;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
@@ -41,14 +37,12 @@ import mage.abilities.effects.common.SacrificeSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.cards.CardImpl;
-import mage.constants.Zone;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.counters.CounterType;
 import mage.filter.FilterPermanent;
 import mage.filter.predicate.Predicates;
 import mage.filter.predicate.permanent.AnotherPredicate;
-import mage.game.Game;
-import mage.game.events.GameEvent;
-import mage.game.permanent.Permanent;
 
 /**
  *
diff --git a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java b/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
index f2636143b2d..e727295c17f 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
@@ -70,11 +70,11 @@ public class ConditionalOneShotEffect extends OneShotEffect {
         if (condition.apply(game, source)) {
             effect.setTargetPointer(this.targetPointer);
             return effect.apply(game, source);
-        } else if (otherwiseEffect != null) {
-            otherwiseEffect.setTargetPointer(this.targetPointer);
-            return otherwiseEffect.apply(game, source);
+        } else if (otherwiseEffect == null) {
+            return true; // nothing to do - no problem
         }
-        return false;
+        otherwiseEffect.setTargetPointer(this.targetPointer);
+        return otherwiseEffect.apply(game, source);
     }
 
     @Override