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

Added AtTheBeginningOfNextUpkeepDelayedTriggeredAbility, fixed ability picker giving not always text back for spell ability.

Browse source
This commit is contained in:
LevelX2 2013-11-17 08:33:53 +01:00
parent 859f068e59
commit 77ac99b03f
8 changed files with 135 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/mage/abilities/AbilitiesImpl.java
View file

@ -29,6 +29,7 @@
package mage.abilities;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
@ -44,15 +45,14 @@ import mage.game.Game;
/**
*
* @author BetaSteward_at_googlemail.com
* @param <T>
*/
public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Abilities<T> {
public AbilitiesImpl() {}
public AbilitiesImpl(T... abilities) {
for (T ability : abilities) {
add(ability);
}
addAll(Arrays.asList(abilities));
}
public AbilitiesImpl(final AbilitiesImpl<T> abilities) {
@ -244,7 +244,7 @@ public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Ab
if (ability.getOriginalId().equals(test.getId())) {
return true;
}
if (ability instanceof MageSingleton && ability.getRule().equals(test.getRule())) {
if (ability instanceof MageSingleton && test instanceof MageSingleton && ability.getRule().equals(test.getRule())) {
return true;
}
}