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

Fix for issue #88 (incomplete handling of unattach effects caused by zone changes of permanents).

Browse source
This commit is contained in:
LevelX2 2012-12-30 11:09:06 +01:00
parent efaeef0cde
commit 412577e6b4
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Mage/src/mage/game/GameImpl.java
View file

@ -1004,25 +1004,28 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
if (filterAura.match(perm, this)) { if (filterAura.match(perm, this)) {
//20091005 - 704.5n, 702.14c //20091005 - 704.5n, 702.14c
if (perm.getAttachedTo() == null) { if (perm.getAttachedTo() == null) {
if (perm.moveToZone(Zone.GRAVEYARD, null, this, false)) if (perm.moveToZone(Zone.GRAVEYARD, null, this, false)) {
somethingHappened = true; somethingHappened = true;
} }
}
else { else {
Target target = perm.getSpellAbility().getTargets().get(0); Target target = perm.getSpellAbility().getTargets().get(0);
if (target instanceof TargetPermanent) { if (target instanceof TargetPermanent) {
Permanent attachedTo = getPermanent(perm.getAttachedTo()); Permanent attachedTo = getPermanent(perm.getAttachedTo());
if (attachedTo == null) { if (attachedTo == null || !attachedTo.getAttachments().contains(perm.getId())) {
if (perm.moveToZone(Zone.GRAVEYARD, null, this, false)) if (perm.moveToZone(Zone.GRAVEYARD, null, this, false)) {
somethingHappened = true; somethingHappened = true;
} }
}
else { else {
Filter auraFilter = perm.getSpellAbility().getTargets().get(0).getFilter(); Filter auraFilter = perm.getSpellAbility().getTargets().get(0).getFilter();
if (!auraFilter.match(attachedTo, this) || attachedTo.hasProtectionFrom(perm, this)) { if (!auraFilter.match(attachedTo, this) || attachedTo.hasProtectionFrom(perm, this)) {
if (perm.moveToZone(Zone.GRAVEYARD, null, this, false)) if (perm.moveToZone(Zone.GRAVEYARD, null, this, false)) {
somethingHappened = true; somethingHappened = true;
} }
} }
} }
}
else if (target instanceof TargetPlayer) { else if (target instanceof TargetPlayer) {
Player attachedTo = getPlayer(perm.getAttachedTo()); Player attachedTo = getPlayer(perm.getAttachedTo());
if (attachedTo == null) { if (attachedTo == null) {
@ -1039,33 +1042,35 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
} }
} }
} }
if (filterLegendary.match(perm, this)) if (filterLegendary.match(perm, this)) {
legendary.add(perm); legendary.add(perm);
}
if (filterEquipment.match(perm, this)) { if (filterEquipment.match(perm, this)) {
//20091005 - 704.5p, 702.14d //20091005 - 704.5p, 702.14d
if (perm.getAttachedTo() != null) { if (perm.getAttachedTo() != null) {
Permanent creature = getPermanent(perm.getAttachedTo()); Permanent creature = getPermanent(perm.getAttachedTo());
if (creature == null) { if (creature == null || !creature.getAttachments().contains(perm.getId())) {
perm.attachTo(null, this); perm.attachTo(null, this);
} } else if (!creature.getCardType().contains(CardType.CREATURE) || creature.hasProtectionFrom(perm, this)) {
else if (!creature.getCardType().contains(CardType.CREATURE) || creature.hasProtectionFrom(perm, this)) { if (creature.removeAttachment(perm.getId(), this)) {
if (creature.removeAttachment(perm.getId(), this))
somethingHappened = true; somethingHappened = true;
} }
} }
} }
}
if (filterFortification.match(perm, this)) { if (filterFortification.match(perm, this)) {
if (perm.getAttachedTo() != null) { if (perm.getAttachedTo() != null) {
Permanent land = getPermanent(perm.getAttachedTo()); Permanent land = getPermanent(perm.getAttachedTo());
if (land == null) { if (land == null || !land.getAttachments().contains(perm.getId())) {
perm.attachTo(null, this); perm.attachTo(null, this);
} }
else if (!land.getCardType().contains(CardType.LAND) || land.hasProtectionFrom(perm, this)) { else if (!land.getCardType().contains(CardType.LAND) || land.hasProtectionFrom(perm, this)) {
if (land.removeAttachment(perm.getId(), this)) if (land.removeAttachment(perm.getId(), this)) {
somethingHappened = true; somethingHappened = true;
} }
} }
} }
}
//20091005 - 704.5q //20091005 - 704.5q
if (perm.getAttachments().size() > 0) { if (perm.getAttachments().size() > 0) {
for (UUID attachmentId: perm.getAttachments()) { for (UUID attachmentId: perm.getAttachments()) {