[refactoring] CantBlockAbility isn't Singleton anymore

Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java

@@ -51,7 +51,7 @@ public class NezumiCutthroat extends CardImpl<NezumiCutthroat> {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
         this.addAbility(FearAbility.getInstance());
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public NezumiCutthroat(final NezumiCutthroat card) {

Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java

@@ -64,7 +64,7 @@ public class VillainousOgre extends CardImpl<VillainousOgre> {
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
 
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
 
         // As long as you control a Demon, Villainous Ogre has "{B}: Regenerate Villainous Ogre.
         this.addAbility( new ConditionalActivatedAbility(

Mage.Sets/src/mage/sets/conflux/ShamblingRemains.java

@@ -54,7 +54,7 @@ public class ShamblingRemains extends CardImpl<ShamblingRemains> {
         this.toughness = new MageInt(3);
 
         // Shambling Remains can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         // Unearth {B}{R}
         this.addAbility(new UnearthAbility(new ManaCostsImpl("{B}{R}")));
     }

Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java

@@ -60,7 +60,7 @@ public class Gravecrawler extends CardImpl<Gravecrawler> {
         this.toughness = new MageInt(1);
 
         // Gravecrawler can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
 
         // You may cast Gravecrawler from your graveyard as long as you control a Zombie.
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new GravecrawlerPlayEffect()));

Mage.Sets/src/mage/sets/darkascension/SightlessGhoul.java

@@ -52,7 +52,7 @@ public class SightlessGhoul extends CardImpl<SightlessGhoul> {
         this.toughness = new MageInt(2);
 
         // Sightless Ghoul can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         // Undying
         this.addAbility(new UndyingAbility());
     }

Mage.Sets/src/mage/sets/darkascension/UnhallowedCathar.java

@@ -54,7 +54,7 @@ public class UnhallowedCathar extends CardImpl<UnhallowedCathar> {
         this.toughness = new MageInt(1);
 
         // Unhallowed Cathar can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public UnhallowedCathar(final UnhallowedCathar card) {

Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java

@@ -48,7 +48,7 @@ public class ScavengingScarab extends CardImpl<ScavengingScarab> {
         this.color.setBlack(true);
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public ScavengingScarab(final ScavengingScarab card) {

Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java

@@ -50,7 +50,7 @@ public class DaggerclawImp extends CardImpl<DaggerclawImp> {
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
         this.addAbility(FlyingAbility.getInstance());
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public DaggerclawImp (final DaggerclawImp card) {

Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java

@@ -54,7 +54,7 @@ public class VampireInterloper extends CardImpl<VampireInterloper> {
         this.addAbility(FlyingAbility.getInstance());
 
         // Vampire Interloper can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public VampireInterloper(final VampireInterloper card) {

Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java

@@ -52,7 +52,7 @@ public class NightshadeStinger extends CardImpl<NightshadeStinger> {
         this.toughness = new MageInt(1);
         this.addAbility(FlyingAbility.getInstance());
         // Nightshade Stinger can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public NightshadeStinger(final NightshadeStinger card) {

Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java

@@ -49,7 +49,7 @@ public class TormentedSoul extends CardImpl<TormentedSoul> {
         this.color.setBlack(true);
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         this.addAbility(new UnblockableAbility());
     }
 

Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java

@@ -57,7 +57,7 @@ public class VeilbornGhoul extends CardImpl<VeilbornGhoul> {
         this.toughness = new MageInt(1);
 
         // Veilborn Ghoul can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         
         // Whenever a Swamp enters the battlefield under your control, you may return Veilborn Ghoul from your graveyard to your hand.
         this.addAbility(new VeilbornGhoulTriggeredAbility());

Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java

@@ -56,7 +56,7 @@ public class CarrionFeeder extends CardImpl<CarrionFeeder> {
         this.toughness = new MageInt(1);
 
         // Carrion Feeder can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         // Sacrifice a creature: Put a +1/+1 counter on Carrion Feeder.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()),

Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java

@@ -51,7 +51,7 @@ public class AshenmoorGouger extends CardImpl<AshenmoorGouger> {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public AshenmoorGouger(final AshenmoorGouger card) {

Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java

@@ -52,7 +52,7 @@ public class InkfathomInfiltrator extends CardImpl<InkfathomInfiltrator> {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         this.addAbility(new UnblockableAbility());
     }
 

Mage.Sets/src/mage/sets/tenth/SpinelessThug.java

@@ -48,7 +48,7 @@ public class SpinelessThug extends CardImpl<SpinelessThug> {
         this.color.setBlack(true);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
     }
 
     public SpinelessThug(final SpinelessThug card) {

Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java

@@ -55,7 +55,7 @@ public class PygmyPyrosaur extends CardImpl<PygmyPyrosaur> {
         this.toughness = new MageInt(1);
 
         // Pygmy Pyrosaur can't block.
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         // {R}: Pygmy Pyrosaur gets +1/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
     }

Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java

@@ -54,7 +54,7 @@ public class BojukaBrigand extends CardImpl<BojukaBrigand> {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         this.addAbility(new AllyEntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true));
     }
 

Mage.Sets/src/mage/sets/zendikar/Bloodghast.java

@@ -60,7 +60,7 @@ public class Bloodghast extends CardImpl<Bloodghast> {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         this.addAbility(new LandfallAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), true));
         ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield);
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect,

Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java

@@ -52,7 +52,7 @@ public class HagraCrocodile extends CardImpl<HagraCrocodile> {
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
 
-        this.addAbility(CantBlockAbility.getInstance());
+        this.addAbility(new CantBlockAbility());
         this.addAbility(new LandfallAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false));
     }
 

Mage/src/mage/abilities/common/CantBlockAbility.java

@@ -1,38 +1,48 @@
 /*
- * To change this template, choose Tools | Templates
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
- * and open the template in the editor.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.common;
 
 import mage.Constants.Duration;
 import mage.Constants.Zone;
-import mage.abilities.Ability;
+import mage.abilities.effects.common.CantBlockSourceEffect;
-import mage.abilities.MageSingleton;
-import mage.abilities.effects.RestrictionEffect;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
-
-import java.io.ObjectStreamException;
 
 /**
  *
  * @author maurer.it_at_gmail.com
  */
-public class CantBlockAbility extends SimpleStaticAbility implements MageSingleton  {
+public class CantBlockAbility extends SimpleStaticAbility {
 
-    private static final CantBlockAbility fINSTANCE =  new CantBlockAbility();
+    public CantBlockAbility() {
-
+        super(Zone.BATTLEFIELD, new CantBlockSourceEffect(Duration.WhileOnBattlefield));
-    private Object readResolve() throws ObjectStreamException {
-        return fINSTANCE;
     }
 
-    public static CantBlockAbility getInstance() {
+    private CantBlockAbility(CantBlockAbility ability) {
-        return fINSTANCE;
+        super(ability);
-    }
-
-    private CantBlockAbility() {
-        super(Zone.BATTLEFIELD, new CantBlockEffect());
     }
 
     @Override
@@ -42,34 +52,6 @@ public class CantBlockAbility extends SimpleStaticAbility implements MageSinglet
 
     @Override
     public CantBlockAbility copy() {
-        return fINSTANCE;
+        return new CantBlockAbility(this);
     }
-
-}
-
-class CantBlockEffect extends RestrictionEffect<CantBlockEffect> implements MageSingleton {
-
-    public CantBlockEffect() {
-        super(Duration.EndOfGame);
-    }
-
-    public CantBlockEffect(final CantBlockEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean applies(Permanent permanent, Ability source, Game game) {
-        return permanent.getAbilities().containsKey(CantBlockAbility.getInstance().getId()) || source.getId().equals(CantBlockAbility.getInstance().getId());
-    }
-
-    @Override
-    public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
-        return !blocker.getAbilities().containsKey(CantBlockAbility.getInstance().getId());
-    }
-
-    @Override
-    public CantBlockEffect copy() {
-        return new CantBlockEffect(this);
-    }
-
 }

Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java

@@ -42,6 +42,10 @@ public class CantBlockSourceEffect extends RestrictionEffect<CantBlockSourceEffe
 
     public CantBlockSourceEffect(Duration duration) {
         super(duration);
+        this.staticText = "{this} can't block";
+        if (duration.equals(Duration.EndOfTurn)) {
+            this.staticText += " this turn";
+        }
     }
 
     public CantBlockSourceEffect(final CantBlockSourceEffect effect) {

Utils/keywords.txt

@@ -21,6 +21,7 @@ Plainswalk|new|
 Rebound|new|
 Swampwalk|new|
 Totem armor|new|
+Unblockable|new|
 Undying|new|
 Deathtouch|instance|
 Defender|instance|
@@ -40,6 +41,5 @@ Scavenge|cost|
 Shroud|instance|
 Soulbond|instance|
 Trample|instance|
-Unblockable|instance|
 Vigilance|instance|
 Wither|instance|