External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 04:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted making Menace a MageSingleton.

Browse source
This commit is contained in:
LevelX2 2017-09-16 10:38:10 +02:00
parent 5d32e21ea0
commit 53324c0f4d
97 changed files with 107 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Mage/src/main/java/mage/abilities/keyword/MenaceAbility.java
View file

@ -5,35 +5,28 @@
*/
package mage.abilities.keyword;
import java.io.ObjectStreamException;
import mage.abilities.Ability;
import mage.abilities.EvasionAbility;
import mage.abilities.MageSingleton;
import mage.abilities.StaticAbility;
import mage.abilities.effects.common.combat.CantBeBlockedByOneEffect;
import mage.constants.Zone;
/**
*
* @author LevelX2
*/
public class MenaceAbility extends EvasionAbility implements MageSingleton {
public class MenaceAbility extends StaticAbility { // Menace may not be a Singleton because the source ability is needed in the continuous effect
private static final MenaceAbility instance = new MenaceAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
public MenaceAbility() {
super(Zone.BATTLEFIELD, new CantBeBlockedByOneEffect(2));
}
public static MenaceAbility getInstance() {
return instance;
}
private MenaceAbility() {
this.addEffect(new CantBeBlockedByOneEffect(2));
public MenaceAbility(final MenaceAbility ability) {
super(ability);
}
@Override
public Ability copy() {
return instance;
return new MenaceAbility(this);
}
@Override

2
Mage/src/main/java/mage/game/permanent/token/PirateToken.java
View file

@ -45,6 +45,6 @@ public class PirateToken extends Token {
subtype.add(SubType.PIRATE);
power = new MageInt(2);
toughness = new MageInt(2);
addAbility(MenaceAbility.getInstance());
addAbility(new MenaceAbility());
}
}