From ebd6e478484710d9e170fea90b5acc768d7fa2ca Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 5 Jul 2015 02:03:59 +0200 Subject: [PATCH] Fixed that Menace was a singleton class, what causes a lot of bugs on the public server and it shouldn't be a singleton anyway. --- .../mage/abilities/keyword/MenaceAbility.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/Mage/src/mage/abilities/keyword/MenaceAbility.java b/Mage/src/mage/abilities/keyword/MenaceAbility.java index 0ae88b54d06..8735b17d3ff 100644 --- a/Mage/src/mage/abilities/keyword/MenaceAbility.java +++ b/Mage/src/mage/abilities/keyword/MenaceAbility.java @@ -5,7 +5,6 @@ */ package mage.abilities.keyword; -import java.io.ObjectStreamException; import mage.abilities.Ability; import mage.abilities.StaticAbility; import mage.abilities.effects.common.combat.CantBeBlockedByOneEffect; @@ -16,33 +15,23 @@ import mage.constants.Zone; * @author LevelX2 */ public class MenaceAbility extends StaticAbility { - - private static final MenaceAbility fINSTANCE = new MenaceAbility(); public MenaceAbility() { super(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2)); } - public MenaceAbility(MenaceAbility ability) { + public MenaceAbility(final MenaceAbility ability) { super(ability); } - - private Object readResolve() throws ObjectStreamException { - return fINSTANCE; - } - public static MenaceAbility getInstance() { - return fINSTANCE; - } - @Override public Ability copy() { - return fINSTANCE; - } + return new MenaceAbility(this); + } @Override public String getRule() { return "Menace (This creature can't be blocked except by two or more creatures.)"; - } - + } + }