github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor change.

Browse source
This commit is contained in:
LevelX2 2017-08-15 01:56:48 +02:00
parent 1fb24116ae
commit 118665dfd4
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Mage/src/main/java/mage/constants/CardType.java
View file

@ -2,22 +2,21 @@ package mage.constants;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
/**
*
* @author North
*/
public enum CardType {
ARTIFACT ("Artifact"),
CONSPIRACY ("Conspiracy"),
CREATURE ("Creature"),
ENCHANTMENT ("Enchantment"),
INSTANT ("Instant"),
LAND ("Land"),
PLANESWALKER ("Planeswalker"),
SORCERY ("Sorcery"),
TRIBAL ("Tribal");
ARTIFACT("Artifact"),
CONSPIRACY("Conspiracy"),
CREATURE("Creature"),
ENCHANTMENT("Enchantment"),
INSTANT("Instant"),
LAND("Land"),
PLANESWALKER("Planeswalker"),
SORCERY("Sorcery"),
TRIBAL("Tribal");
private final String text;
@ -31,8 +30,8 @@ public enum CardType {
}
/**
* Returns all of the card types from two lists of card types.
* Duplicates are eliminated.
* Returns all of the card types from two lists of card types. Duplicates
* are eliminated.
*/
public static CardType[] mergeTypes(CardType[] a, CardType[] b) {
EnumSet<CardType> cardTypes = EnumSet.noneOf(CardType.class);