From 09a099facd4984000383e9784d154aaa42bf7553 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 3 Jan 2015 23:47:30 +0100
Subject: [PATCH] Minor changes to some cards.

---
 .../mage/sets/elspethvstezzeret/Pentavus.java |  6 +-
 .../mage/sets/gatecrash/SimicFluxmage.java    |  2 +-
 .../src/mage/sets/visions/Necromancy.java     | 72 +++++++++----------
 3 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java
index c3e2be28c54..21f732d6c15 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/Pentavus.java
@@ -67,7 +67,11 @@ public class Pentavus extends CardImpl {
         this.subtype.add("Construct");
         this.power = new MageInt(0);
         this.toughness = new MageInt(0);
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5))));
+
+        // Pentavus enters the battlefield with five +1/+1 counters on it.
+        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)),
+                "with five +1/+1 counters on it"));        
+
         Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new PentaviteToken(), 1), new GenericManaCost(1));
         firstAbility.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
         this.addAbility(firstAbility);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java
index 30a2a485cbd..44428ce4e35 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SimicFluxmage.java
@@ -105,7 +105,7 @@ class MoveCounterFromSourceToTargetEffect extends OneShotEffect {
         if (sourcePermanent != null && sourcePermanent.getCounters().getCount(CounterType.P1P1) > 0) {
             Permanent targetPermanent = game.getPermanent(targetPointer.getFirst(game, source));
             if (targetPermanent != null) {
-                sourcePermanent.getCounters().removeCounter(CounterType.P1P1, 1);
+                sourcePermanent.removeCounters(CounterType.P1P1.createInstance(), game);
                 targetPermanent.addCounters(CounterType.P1P1.createInstance(), game);
                 return true;
             }
diff --git a/Mage.Sets/src/mage/sets/visions/Necromancy.java b/Mage.Sets/src/mage/sets/visions/Necromancy.java
index 388c40c0e74..1eded8df041 100644
--- a/Mage.Sets/src/mage/sets/visions/Necromancy.java
+++ b/Mage.Sets/src/mage/sets/visions/Necromancy.java
@@ -248,41 +248,41 @@ class NecromancyLeavesBattlefieldTriggeredEffect extends OneShotEffect {
     }
 }
 
-class NecromancyAttachEffect extends OneShotEffect {
-
-    public NecromancyAttachEffect(Outcome outcome) {
-        super(outcome);
-    }
-
-    public NecromancyAttachEffect(Outcome outcome, String rule) {
-        super(outcome);
-        staticText = rule;
-    }
-
-    public NecromancyAttachEffect(final NecromancyAttachEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public NecromancyAttachEffect copy() {
-        return new NecromancyAttachEffect(this);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        Card card = game.getCard(source.getFirstTarget());
-        if (card != null && game.getState().getZone(source.getFirstTarget()).equals(Zone.GRAVEYARD)) {
-            // Card have no attachedTo attribute yet so write ref only to enchantment now
-            Permanent enchantment = game.getPermanent(source.getSourceId());
-            if (enchantment != null) {
-                enchantment.attachTo(card.getId(), game);
-            }
-            return true;
-        }
-        return false;
-    }
-
-}
+//class NecromancyAttachEffect extends OneShotEffect {
+//
+//    public NecromancyAttachEffect(Outcome outcome) {
+//        super(outcome);
+//    }
+//
+//    public NecromancyAttachEffect(Outcome outcome, String rule) {
+//        super(outcome);
+//        staticText = rule;
+//    }
+//
+//    public NecromancyAttachEffect(final NecromancyAttachEffect effect) {
+//        super(effect);
+//    }
+//
+//    @Override
+//    public NecromancyAttachEffect copy() {
+//        return new NecromancyAttachEffect(this);
+//    }
+//
+//    @Override
+//    public boolean apply(Game game, Ability source) {
+//        Card card = game.getCard(source.getFirstTarget());
+//        if (card != null && game.getState().getZone(source.getFirstTarget()).equals(Zone.GRAVEYARD)) {
+//            // Card have no attachedTo attribute yet so write ref only to enchantment now
+//            Permanent enchantment = game.getPermanent(source.getSourceId());
+//            if (enchantment != null) {
+//                enchantment.attachTo(card.getId(), game);
+//            }
+//            return true;
+//        }
+//        return false;
+//    }
+//
+//}
 
 class NecromancyChangeAbilityEffect extends ContinuousEffectImpl implements SourceEffect {
 
@@ -319,7 +319,7 @@ class NecromancyChangeAbilityEffect extends ContinuousEffectImpl implements Sour
 
     @Override
     public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
-        Permanent permanent = affectedObjectList.get(0).getPermanent(game);;
+        Permanent permanent = affectedObjectList.get(0).getPermanent(game);
         if (permanent != null) {
             switch (layer) {
                 case TypeChangingEffects_4: