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

Merge remote-tracking branch 'remotes/upstream/master'

Browse source
This commit is contained in:
ciaccona007 2017-07-17 21:20:08 -04:00
commit b9f4d9523c
81 changed files with 297 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/constants/SubType.java
View file

@ -73,7 +73,7 @@ public enum SubType {
BIRD("Bird", SubTypeSet.CreatureType, false),
BITH("Bith", SubTypeSet.CreatureType, true), // Star Wars
BLINKMOTH("Blinkmoth", SubTypeSet.CreatureType, false),
BOARD("Boar", SubTypeSet.CreatureType, false),
BOAR("Boar", SubTypeSet.CreatureType, false),
BRINGER("Bringer", SubTypeSet.CreatureType, false),
BRUSHWAGG("Brushwagg", SubTypeSet.CreatureType, false),

5
Mage/src/main/java/mage/util/SubTypeList.java
View file

@ -3,6 +3,7 @@ package mage.util;
import mage.constants.SubType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -29,6 +30,10 @@ public class SubTypeList extends ArrayList<SubType> {
return super.add(s);
}
public boolean add(SubType... subTypes) {
return Collections.addAll(this, subTypes);
}
public boolean add(String s) {
return add(SubType.byDescription(s));
}