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

Change FilterSpell and CantTargetEffect

Browse source
This commit is contained in:
Quercitron 2014-01-12 19:31:23 +04:00
parent d08d9485a1
commit 8a5dc5e287
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/mage/abilities/effects/common/CantTargetControlledEffect.java → Mage/src/mage/abilities/effects/common/CantTargetEffect.java
View file

@ -46,23 +46,23 @@ import mage.game.stack.StackObject;
*
* @author BetaSteward_at_googlemail.com
*/
public class CantTargetControlledEffect extends ReplacementEffectImpl<CantTargetControlledEffect> {
public class CantTargetEffect extends ReplacementEffectImpl<CantTargetEffect> {
private FilterPermanent filterTarget;
private FilterStackObject filterSource;
public CantTargetControlledEffect(FilterPermanent filterTarget, FilterStackObject filterSource, Duration duration) {
public CantTargetEffect(FilterPermanent filterTarget, FilterStackObject filterSource, Duration duration) {
super(duration, Outcome.Benefit);
this.filterTarget = filterTarget;
this.filterSource = filterSource;
setText();
}
public CantTargetControlledEffect(FilterPermanent filterTarget, Duration duration) {
public CantTargetEffect(FilterPermanent filterTarget, Duration duration) {
this(filterTarget, null, duration);
}
public CantTargetControlledEffect(final CantTargetControlledEffect effect) {
public CantTargetEffect(final CantTargetEffect effect) {
super(effect);
if (effect.filterTarget != null)
this.filterTarget = effect.filterTarget.copy();
@ -71,8 +71,8 @@ public class CantTargetControlledEffect extends ReplacementEffectImpl<CantTarget
}
@Override
public CantTargetControlledEffect copy() {
return new CantTargetControlledEffect(this);
public CantTargetEffect copy() {
return new CantTargetEffect(this);
}
@Override
@ -88,14 +88,13 @@ public class CantTargetControlledEffect extends ReplacementEffectImpl<CantTarget
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getType() == EventType.TARGET) {
filterTarget.add(new ControllerPredicate(TargetController.YOU));
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null && filterTarget.match(permanent, source.getSourceId(), source.getControllerId(), game)) {
if (filterSource == null)
return true;
else {
StackObject sourceObject = game.getStack().getStackObject(event.getSourceId());
if (sourceObject != null && filterSource.match(sourceObject, game)) {
if (sourceObject != null && filterSource.match(sourceObject, sourceObject.getSourceId(), game)) {
return true;
}
}

15
Mage/src/mage/filter/FilterSpell.java
View file

@ -28,13 +28,16 @@
package mage.filter;
import java.util.UUID;
import mage.game.Game;
import mage.game.stack.Spell;
import mage.game.stack.StackObject;
/**
*
* @author North
* @author North, Quercitron
*/
public class FilterSpell extends FilterStackObject<Spell> {
public class FilterSpell extends FilterStackObject {
public FilterSpell() {
super("spell");
@ -47,6 +50,14 @@ public class FilterSpell extends FilterStackObject<Spell> {
public FilterSpell(final FilterSpell filter) {
super(filter);
}
@Override
public boolean match(StackObject stackObject, UUID playerId, Game game) {
if (!(stackObject instanceof Spell)) {
return false;
}
return super.match(stackObject, playerId, game);
}
@Override
public FilterSpell copy() {