From ec90f35e0f68023360b3ea5ba634f9ee3424baa7 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 21 Apr 2018 12:07:46 +0200
Subject: [PATCH] * Rampaging Cyclops - Fixed that its power was not reduced if
 blocked by 2 or more blockers.

---
 .../src/mage/cards/r/RampagingCyclops.java    | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/r/RampagingCyclops.java b/Mage.Sets/src/mage/cards/r/RampagingCyclops.java
index 530a076eac..c9cca1893f 100644
--- a/Mage.Sets/src/mage/cards/r/RampagingCyclops.java
+++ b/Mage.Sets/src/mage/cards/r/RampagingCyclops.java
@@ -34,11 +34,11 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.decorator.ConditionalContinuousEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
-import mage.constants.SubType;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.combat.CombatGroup;
@@ -83,24 +83,11 @@ enum RampagingCyclopsCondition implements Condition {
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = game.getBattlefield().getPermanent(source.getSourceId());
-        if (permanent == null) {
+        if (permanent == null || !permanent.isAttacking()) {
             return false;
         }
-        for (CombatGroup group : game.getCombat().getBlockingGroups()) {
-            if (group.getAttackers().contains(permanent.getId())) {
-                int blockerCount = 0;
-                for (UUID blockerId : group.getBlockers()) {
-                    Permanent blocker = game.getPermanent(blockerId);
-                    if (blocker != null) {
-                        blockerCount++;
-                    }
-                    if (blockerCount > 1) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
+        CombatGroup combatGroup = game.getCombat().findGroup(permanent.getId());
+        return combatGroup != null && combatGroup.getBlockers().size() > 1;
     }
 
     @Override