github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug of ZoneChangeAllTriggeredAbility trying to get permanent from battelfield if permanent left battlefield.

Browse source
This commit is contained in:
LevelX2 2013-06-04 00:55:50 +02:00
parent 20a0e16604
commit 2259a534b2
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
View file

@ -75,7 +75,12 @@ public class ZoneChangeAllTriggeredAbility<T extends ZoneChangeAllTriggeredAbili
if (event.getType() == EventType.ZONE_CHANGE) { if (event.getType() == EventType.ZONE_CHANGE) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event; ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if ((fromZone == null || zEvent.getFromZone() == fromZone) && (toZone == null || zEvent.getToZone() == toZone)) { if ((fromZone == null || zEvent.getFromZone() == fromZone) && (toZone == null || zEvent.getToZone() == toZone)) {
Permanent perm = game.getPermanent(event.getTargetId()); Permanent perm;
if (zEvent.getTarget() != null) {
perm = zEvent.getTarget();
} else {
perm = game.getPermanent(event.getTargetId()); // LevelX2: maybe this part is not neccessary
}
if (perm != null && filter.match(perm, sourceId, controllerId, game)) { if (perm != null && filter.match(perm, sourceId, controllerId, game)) {
return true; return true;
} }

9
Mage/src/mage/abilities/keyword/ProtectionAbility.java
View file

@ -67,18 +67,21 @@ public class ProtectionAbility extends StaticAbility<ProtectionAbility> {
public boolean canTarget(MageObject source, Game game) { public boolean canTarget(MageObject source, Game game) {
if (filter instanceof FilterPermanent) { if (filter instanceof FilterPermanent) {
if (source instanceof Permanent) if (source instanceof Permanent) {
return !filter.match(source, game); return !filter.match(source, game);
}
return true; return true;
} }
if (filter instanceof FilterSpell) { if (filter instanceof FilterSpell) {
if (source instanceof Spell) if (source instanceof Spell) {
return !filter.match(source, game); return !filter.match(source, game);
}
return true; return true;
} }
if (filter instanceof FilterCard) { if (filter instanceof FilterCard) {
if (source instanceof Card) if (source instanceof Card) {
return !filter.match(source, game); return !filter.match(source, game);
}
return true; return true;
} }
if (filter instanceof FilterObject) { if (filter instanceof FilterObject) {