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

Reversed some formatting changed that led to casting errors.

Browse source
This commit is contained in:
LevelX2 2014-03-14 14:43:54 +01:00
parent 09b7e7baea
commit dc0d5a4bc8
7 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/mage/filter/Filter.java
View file

@ -29,7 +29,6 @@
package mage.filter;
import java.io.Serializable;
import mage.MageObject;
import mage.filter.predicate.Predicate;
import mage.game.Game;

4
Mage/src/mage/filter/FilterCard.java
View file

@ -88,7 +88,7 @@ public class FilterCard extends FilterObject<Card> {
return false;
}
return Predicates.and(extraPredicates).apply(new ObjectPlayer<>(card, playerId), game);
return Predicates.and(extraPredicates).apply(new ObjectPlayer(card, playerId), game);
}
public boolean match(Card card, UUID sourceId, UUID playerId, Game game) {
@ -96,7 +96,7 @@ public class FilterCard extends FilterObject<Card> {
return false;
}
return Predicates.and(extraPredicates).apply(new ObjectSourcePlayer<>(card, sourceId, playerId), game);
return Predicates.and(extraPredicates).apply(new ObjectSourcePlayer(card, sourceId, playerId), game);
}
public void add(ObjectPlayerPredicate predicate) {

3
Mage/src/mage/filter/FilterImpl.java
View file

@ -30,7 +30,6 @@ package mage.filter;
import java.util.ArrayList;
import java.util.List;
import mage.MageObject;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.game.Game;
@ -53,7 +52,7 @@ public abstract class FilterImpl<E> implements Filter<E> {
this.message = name;
}
public FilterImpl(FilterImpl<E> filter) {
public FilterImpl(FilterImpl filter) {
this.message = filter.message;
this.predicates = new ArrayList<>(filter.predicates);
}

2
Mage/src/mage/filter/FilterObject.java
View file

@ -46,7 +46,7 @@ public class FilterObject<E extends MageObject> extends FilterImpl<E> {
super(name);
}
public FilterObject(FilterObject<E> filter) {
public FilterObject(FilterObject filter) {
super(filter);
}
}

2
Mage/src/mage/filter/FilterPlayer.java
View file

@ -60,7 +60,7 @@ public class FilterPlayer extends FilterImpl<Player> {
this.extraPredicates = new ArrayList<>(filter.extraPredicates);
}
public void add(ObjectPlayerPredicate<ObjectPlayer<Player>> predicate) {
public void add(ObjectPlayerPredicate predicate) {
extraPredicates.add(predicate);
}

1
Mage/src/mage/filter/predicate/ObjectPlayer.java
View file

@ -28,7 +28,6 @@
package mage.filter.predicate;
import java.util.UUID;
import mage.MageObject;
/**
*

2
Mage/src/mage/filter/predicate/other/CardTextPredicate.java
View file

@ -28,8 +28,6 @@
package mage.filter.predicate.other;
import mage.cards.Card;
import mage.filter.predicate.ObjectPlayer;
import mage.filter.predicate.ObjectPlayerPredicate;
import mage.filter.predicate.Predicate;
import mage.game.Game;