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

Fixed Heavy Arbalest. Fixed FilterCreaturePermanent.

Browse source
This commit is contained in:
magenoxx 2011-08-03 20:20:15 +04:00
parent ea33149b6f
commit 8d404138c3
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java
View file

@ -111,7 +111,7 @@ class SkipUntapSourceEffect extends ReplacementEffectImpl<SkipUntapSourceEffect>
public boolean applies(GameEvent event, Ability source, Game game) { public boolean applies(GameEvent event, Ability source, Game game) {
if (game.getTurn().getStepType() == PhaseStep.UNTAP if (game.getTurn().getStepType() == PhaseStep.UNTAP
&& event.getType() == EventType.UNTAP && event.getType() == EventType.UNTAP
&& event.getTargetId().equals(source.getId())) { && event.getTargetId().equals(source.getSourceId())) {
return true; return true;
} }
return false; return false;

11
Mage/src/mage/filter/common/FilterCreaturePermanent.java
View file

@ -73,15 +73,12 @@ public class FilterCreaturePermanent<T extends FilterCreaturePermanent<T>> exten
if (!super.match(permanent)) if (!super.match(permanent))
return notFilter; return notFilter;
if (useAttacking && permanent.isAttacking() != attacking) { if (useAttacking) {
if (useBlocking) { if (permanent.isAttacking() == attacking) {
if ((permanent.getBlocking() > 0) != blocking) return !notFilter;
return notFilter; }
} else
return notFilter;
} }
if (useBlocking && (permanent.getBlocking() > 0) != blocking) if (useBlocking && (permanent.getBlocking() > 0) != blocking)
return notFilter; return notFilter;