From 22ff1c400dd92f82abb179af14cef05d7b75ac88 Mon Sep 17 00:00:00 2001
From: Plopman <Plopman@hotmail.ch>
Date: Sun, 13 Jan 2013 16:21:42 +0100
Subject: [PATCH] [GTC]Fixed rarity and Zameck Guildmage

---
 Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java | 2 +-
 Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java        | 4 +---
 Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java    | 2 +-
 Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java   | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java
index ff578e9014..e6dc53852c 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicSkirmisher.java
@@ -68,7 +68,7 @@ public class AngelicSkirmisher extends CardImpl<AngelicSkirmisher> {
     }
 
     public AngelicSkirmisher(UUID ownerId) {
-        super(ownerId, 3, "Angelic Skirmisher", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}{W}");
+        super(ownerId, 3, "Angelic Skirmisher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{W}");
         this.expansionSetCode = "GTC";
         this.subtype.add("Angel");
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java
index 2818f66811..a7e541e973 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/Rubblehulk.java
@@ -38,10 +38,8 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
-import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect;
 import mage.abilities.keyword.BloodrushAbility;
-import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterControlledPermanent;
@@ -55,7 +53,7 @@ public class Rubblehulk extends CardImpl<Rubblehulk> {
     private final static FilterControlledPermanent filter = new FilterControlledLandPermanent("lands you control");
 
     public Rubblehulk(UUID ownerId) {
-        super(ownerId, 191, "Rubblehulk", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{R}{G}");
+        super(ownerId, 191, "Rubblehulk", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{R}{G}");
         this.expansionSetCode = "GTC";
         this.subtype.add("Elemental");
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java
index 5cd17f1d55..a90ab0f4db 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/TreasuryThrull.java
@@ -55,7 +55,7 @@ public class TreasuryThrull extends CardImpl<TreasuryThrull> {
     }
 
     public TreasuryThrull(UUID ownerId) {
-        super(ownerId, 201, "Treasury Thrull", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{4}{W}{B}");
+        super(ownerId, 201, "Treasury Thrull", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{B}");
         this.expansionSetCode = "GTC";
         this.subtype.add("Thrull");
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java
index da4a9b586f..4032d94851 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ZameckGuildmage.java
@@ -38,7 +38,6 @@ import mage.abilities.Mode;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.RemoveCounterCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
-import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
 import mage.abilities.effects.ReplacementEffectImpl;
@@ -114,7 +113,7 @@ class EntersBattlefieldEffect extends ReplacementEffectImpl<EntersBattlefieldEff
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
             Permanent permanent = game.getPermanent(event.getTargetId());
-            if (permanent != null && permanent.getControllerId().equals(source.getControllerId())) {
+            if (permanent != null && permanent.getControllerId().equals(source.getControllerId()) && permanent.getCardType().contains(CardType.CREATURE)) {
                 return true;
             }
         }