Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Add Subtype to the CardAttribute Framework

Browse source 
This is a massive change. I’ve refrained from unrelated refactoring
when possible but there are still a lot of changes here.
This commit is contained in:
Samuel Sandeen 2016-08-28 17:30:10 -04:00
parent a1a3c0c6a7
commit 282443c231
272 changed files with 514 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/MageObjectImpl.java
View file

@ -122,7 +122,7 @@ public abstract class MageObjectImpl implements MageObject {
}
@Override
public List<String> getSubtype() {
public List<String> getSubtype(Game game) {
return subtype;
}
@ -182,11 +182,12 @@ public abstract class MageObjectImpl implements MageObject {
}
@Override
public boolean hasSubtype(String value) {
public boolean hasSubtype(String value, Game game) {
if (value == null) {
return false;
}
if (this.subtype.contains(value)) {
List<String> subtypes = this.getSubtype(game);
if (subtypes.contains(value)) {
return true;
} else {
// checking for Changeling
@ -196,7 +197,7 @@ public abstract class MageObjectImpl implements MageObject {
return false;
}
// as it is creature subtype, then check the existence of Changeling
return abilities.contains(ChangelingAbility.getInstance()) || this.subtype.contains(ChangelingAbility.ALL_CREATURE_TYPE);
return abilities.contains(ChangelingAbility.getInstance()) || subtypes.contains(ChangelingAbility.ALL_CREATURE_TYPE);
}
}