[MID] changed daybound/nightbound from being singleton

Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java

@@ -35,7 +35,7 @@ public final class ArlinnTheMoonsFury extends CardImpl {
         this.nightCard = true;
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
 
         // +2: Add {R}{G}.
         this.addAbility(new LoyaltyAbility(new BasicManaEffect(new Mana(

Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java

@@ -40,7 +40,7 @@ public final class ArlinnThePacksHope extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
 
         // +1: Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it.
         Ability ability = new LoyaltyAbility(new CastAsThoughItHadFlashAllEffect(

Mage.Sets/src/mage/cards/b/BirdAdmirer.java

@@ -32,7 +32,7 @@ public final class BirdAdmirer extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private BirdAdmirer(final BirdAdmirer card) {

Mage.Sets/src/mage/cards/b/BrutalCathar.java

@@ -40,7 +40,7 @@ public final class BrutalCathar extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private BrutalCathar(final BrutalCathar card) {

Mage.Sets/src/mage/cards/b/BurlyBreaker.java

@@ -32,7 +32,7 @@ public final class BurlyBreaker extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private BurlyBreaker(final BurlyBreaker card) {

Mage.Sets/src/mage/cards/d/DireStrainBrawler.java

@@ -29,7 +29,7 @@ public final class DireStrainBrawler extends CardImpl {
         this.addAbility(VigilanceAbility.getInstance());
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private DireStrainBrawler(final DireStrainBrawler card) {

Mage.Sets/src/mage/cards/d/DireStrainDemolisher.java

@@ -30,7 +30,7 @@ public final class DireStrainDemolisher extends CardImpl {
         this.addAbility(new WardAbility(new ManaCostsImpl<>("{3}")));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private DireStrainDemolisher(final DireStrainDemolisher card) {

Mage.Sets/src/mage/cards/f/FangbladeBrigand.java

@@ -43,7 +43,7 @@ public final class FangbladeBrigand extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private FangbladeBrigand(final FangbladeBrigand card) {

Mage.Sets/src/mage/cards/f/FangbladeEviscerator.java

@@ -47,7 +47,7 @@ public final class FangbladeEviscerator extends CardImpl {
         ), new ManaCostsImpl<>("{4}{R}")));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private FangbladeEviscerator(final FangbladeEviscerator card) {

Mage.Sets/src/mage/cards/f/FrenziedTrapbreaker.java

@@ -52,7 +52,7 @@ public final class FrenziedTrapbreaker extends CardImpl {
         this.addAbility(ability);
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private FrenziedTrapbreaker(final FrenziedTrapbreaker card) {

Mage.Sets/src/mage/cards/g/GraveyardGlutton.java

@@ -46,7 +46,7 @@ public final class GraveyardGlutton extends CardImpl {
         this.addAbility(ability);
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private GraveyardGlutton(final GraveyardGlutton card) {

Mage.Sets/src/mage/cards/g/GraveyardTrespasser.java

@@ -48,7 +48,7 @@ public final class GraveyardTrespasser extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private GraveyardTrespasser(final GraveyardTrespasser card) {

Mage.Sets/src/mage/cards/h/HarvesttideAssailant.java

@@ -29,7 +29,7 @@ public final class HarvesttideAssailant extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private HarvesttideAssailant(final HarvesttideAssailant card) {

Mage.Sets/src/mage/cards/h/HarvesttideInfiltrator.java

@@ -31,7 +31,7 @@ public final class HarvesttideInfiltrator extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private HarvesttideInfiltrator(final HarvesttideInfiltrator card) {

Mage.Sets/src/mage/cards/h/HoundTamer.java

@@ -44,7 +44,7 @@ public final class HoundTamer extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private HoundTamer(final HoundTamer card) {

Mage.Sets/src/mage/cards/k/KessigNaturalist.java

@@ -38,7 +38,7 @@ public final class KessigNaturalist extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private KessigNaturalist(final KessigNaturalist card) {

Mage.Sets/src/mage/cards/l/LordOfTheUlvenwald.java

@@ -56,7 +56,7 @@ public final class LordOfTheUlvenwald extends CardImpl {
         this.addAbility(new AttacksTriggeredAbility(new LordOfTheUlvenwaldEffect()));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private LordOfTheUlvenwald(final LordOfTheUlvenwald card) {

Mage.Sets/src/mage/cards/m/MoonrageBrute.java

@@ -34,7 +34,7 @@ public final class MoonrageBrute extends CardImpl {
         this.addAbility(new WardAbility(new PayLifeCost(3)));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private MoonrageBrute(final MoonrageBrute card) {

Mage.Sets/src/mage/cards/o/OutlandLiberator.java

@@ -37,7 +37,7 @@ public final class OutlandLiberator extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private OutlandLiberator(final OutlandLiberator card) {

Mage.Sets/src/mage/cards/r/RecklessStormseeker.java

@@ -47,7 +47,7 @@ public final class RecklessStormseeker extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private RecklessStormseeker(final RecklessStormseeker card) {

Mage.Sets/src/mage/cards/s/SeafaringWerewolf.java

@@ -36,7 +36,7 @@ public final class SeafaringWerewolf extends CardImpl {
         ));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private SeafaringWerewolf(final SeafaringWerewolf card) {

Mage.Sets/src/mage/cards/s/ShadyTraveler.java

@@ -31,7 +31,7 @@ public final class ShadyTraveler extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private ShadyTraveler(final ShadyTraveler card) {

Mage.Sets/src/mage/cards/s/SpellruneHowler.java

@@ -35,7 +35,7 @@ public final class SpellruneHowler extends CardImpl {
         ));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private SpellruneHowler(final SpellruneHowler card) {

Mage.Sets/src/mage/cards/s/SpellrunePainter.java

@@ -38,7 +38,7 @@ public final class SpellrunePainter extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private SpellrunePainter(final SpellrunePainter card) {

Mage.Sets/src/mage/cards/s/StalkingPredator.java

@@ -29,7 +29,7 @@ public final class StalkingPredator extends CardImpl {
         this.addAbility(new MenaceAbility());
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private StalkingPredator(final StalkingPredator card) {

Mage.Sets/src/mage/cards/s/StormChargedSlasher.java

@@ -49,7 +49,7 @@ public final class StormChargedSlasher extends CardImpl {
         this.addAbility(ability);
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private StormChargedSlasher(final StormChargedSlasher card) {

Mage.Sets/src/mage/cards/s/SuspiciousStowaway.java

@@ -39,7 +39,7 @@ public final class SuspiciousStowaway extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private SuspiciousStowaway(final SuspiciousStowaway card) {

Mage.Sets/src/mage/cards/t/TavernRuffian.java

@@ -29,7 +29,7 @@ public final class TavernRuffian extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private TavernRuffian(final TavernRuffian card) {

Mage.Sets/src/mage/cards/t/TavernSmasher.java

@@ -28,7 +28,7 @@ public final class TavernSmasher extends CardImpl {
         this.toughness = new MageInt(5);
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private TavernSmasher(final TavernSmasher card) {

Mage.Sets/src/mage/cards/t/TirelessHauler.java

@@ -31,7 +31,7 @@ public final class TirelessHauler extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private TirelessHauler(final TirelessHauler card) {

Mage.Sets/src/mage/cards/t/TovolarsHuntmaster.java

@@ -33,7 +33,7 @@ public final class TovolarsHuntmaster extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private TovolarsHuntmaster(final TovolarsHuntmaster card) {

Mage.Sets/src/mage/cards/t/TovolarsPackleader.java

@@ -61,7 +61,7 @@ public final class TovolarsPackleader extends CardImpl {
         ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private TovolarsPackleader(final TovolarsPackleader card) {

Mage.Sets/src/mage/cards/u/UntamedPup.java

@@ -61,7 +61,7 @@ public final class UntamedPup extends CardImpl {
         this.addAbility(ability);
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private UntamedPup(final UntamedPup card) {

Mage.Sets/src/mage/cards/v/VillageReavers.java

@@ -49,7 +49,7 @@ public final class VillageReavers extends CardImpl {
         )));
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private VillageReavers(final VillageReavers card) {

Mage.Sets/src/mage/cards/v/VillageWatch.java

@@ -32,7 +32,7 @@ public final class VillageWatch extends CardImpl {
 
         // Daybound
         this.addAbility(new TransformAbility());
-        this.addAbility(DayboundAbility.getInstance());
+        this.addAbility(new DayboundAbility());
     }
 
     private VillageWatch(final VillageWatch card) {

Mage.Sets/src/mage/cards/w/WingShredder.java

@@ -30,7 +30,7 @@ public final class WingShredder extends CardImpl {
         this.addAbility(ReachAbility.getInstance());
 
         // Nightbound
-        this.addAbility(NightboundAbility.getInstance());
+        this.addAbility(new NightboundAbility());
     }
 
     private WingShredder(final WingShredder card) {

Mage/src/main/java/mage/abilities/keyword/DayboundAbility.java

@@ -1,34 +1,20 @@
 package mage.abilities.keyword;
 
-import mage.abilities.MageSingleton;
 import mage.abilities.StaticAbility;
 import mage.constants.Zone;
 
-import java.io.ObjectStreamException;
-
 /**
  * @author TheElk801
  * TODO: Implement this
  */
-public class DayboundAbility extends StaticAbility implements MageSingleton {
+public class DayboundAbility extends StaticAbility {
 
-    private static final DayboundAbility instance;
+    public DayboundAbility() {
-
+        super(Zone.BATTLEFIELD, null);
-    static {
-        instance = new DayboundAbility();
-        // instance.addIcon(DayboundAbilityIcon.instance); (needs to be added)
     }
 
-    private Object readResolve() throws ObjectStreamException {
+    private DayboundAbility(final DayboundAbility ability) {
-        return instance;
+        super(ability);
-    }
-
-    public static DayboundAbility getInstance() {
-        return instance;
-    }
-
-    private DayboundAbility() {
-        super(Zone.ALL, null);
     }
 
     @Override
@@ -38,6 +24,6 @@ public class DayboundAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public DayboundAbility copy() {
-        return instance;
+        return new DayboundAbility(this);
     }
 }

Mage/src/main/java/mage/abilities/keyword/NightboundAbility.java

@@ -1,34 +1,20 @@
 package mage.abilities.keyword;
 
-import mage.abilities.MageSingleton;
 import mage.abilities.StaticAbility;
 import mage.constants.Zone;
 
-import java.io.ObjectStreamException;
-
 /**
  * @author TheElk801
  * TODO: Implement this
  */
-public class NightboundAbility extends StaticAbility implements MageSingleton {
+public class NightboundAbility extends StaticAbility {
 
-    private static final NightboundAbility instance;
+    public NightboundAbility() {
-
+        super(Zone.BATTLEFIELD, null);
-    static {
-        instance = new NightboundAbility();
-        // instance.addIcon(NightboundAbilityIcon.instance); (needs to be added)
     }
 
-    private Object readResolve() throws ObjectStreamException {
+    private NightboundAbility(final NightboundAbility ability) {
-        return instance;
+        super(ability);
-    }
-
-    public static NightboundAbility getInstance() {
-        return instance;
-    }
-
-    private NightboundAbility() {
-        super(Zone.ALL, null);
     }
 
     @Override
@@ -38,6 +24,6 @@ public class NightboundAbility extends StaticAbility implements MageSingleton {
 
     @Override
     public NightboundAbility copy() {
-        return instance;
+        return new NightboundAbility(this);
     }
 }

Utils/keywords.txt

@@ -16,7 +16,7 @@ Crew|number|
 Cumulative upkeep|cost|
 Cycling|cost|
 Dash|card, manaString|
-Daybound|instance|
+Daybound|new|
 Deathtouch|instance|
 Demonstrate|new|
 Delve|new|
@@ -73,7 +73,7 @@ Mountainwalk|new|
 Morph|card, cost|
 Mutate|card, manaString|
 Myriad|new|
-Nightbound|instance|
+Nightbound|new|
 Ninjutsu|cost|
 Outlast|cost|
 Partner|instance|