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

Addressed Feedback and added cards

Browse source 
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
This commit is contained in:
Mark Langen 2017-04-04 17:07:59 -06:00
parent 18663f0a7a
commit fd73fd39af
6 changed files with 218 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package mage.constants;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
/**
@ -33,13 +35,9 @@ public enum CardType {
* Duplicates are eliminated.
*/
public static CardType[] mergeTypes(CardType[] a, CardType[] b) {
HashSet<CardType> cardTypes = new HashSet<>();
for (CardType t: a) {
cardTypes.add(t);
}
for (CardType t: b) {
cardTypes.add(t);
}
EnumSet<CardType> cardTypes = EnumSet.noneOf(CardType.class);
cardTypes.addAll(Arrays.asList(a));
cardTypes.addAll(Arrays.asList(b));
return cardTypes.toArray(new CardType[0]);
}