Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turning into an artifact creature should retain previous subtypes

master
melvinzhang 2015-04-04 11:16:52 +08:00
parent f67446e360
commit edf998948f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/magic/model/action/MagicBecomesAction.java
View File

@ -114,10 +114,13 @@ public class MagicBecomesAction extends MagicAction {
final MagicStatic ST = new MagicStatic(MagicLayer.Type, duration) {
@Override
public void modSubTypeFlags(final MagicPermanent permanent, final Set<MagicSubType> flags) {
if (additionTo == false) {
// turning into an artifact creature retains previous subtypes
if (additionTo || (type.contains(MagicType.Creature) && type.contains(MagicType.Artifact))) {
flags.addAll(subType);
} else {
flags.clear();
flags.addAll(subType);
}
flags.addAll(subType);
}
};
game.doAction(new MagicAddStaticAction(permanent, ST));