External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 14:32:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2015-08-27 14:51:21 +02:00
parent 43fb00dc37
commit b63cc121ef
7 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/mage/abilities/keyword/EntwineAbility.java
View file

@ -90,6 +90,7 @@ public class EntwineAbility extends StaticAbility implements OptionalAdditionalM
}
}
@Override
public boolean isActivated() {
if (additionalCost != null) {
return additionalCost.isActivated();

15
Mage/src/mage/players/PlayerImpl.java
View file

@ -1033,8 +1033,10 @@ public abstract class PlayerImpl implements Player, Serializable {
int bookmark = game.bookmarkState();
if (ability.activate(game, false)) {
if (ability.resolve(game)) {
if (ability.isUndoPossible() && storedBookmark == -1 || storedBookmark > bookmark) { // e.g. usefull for undo Nykthos, Shrine to Nyx
if (ability.isUndoPossible() && (storedBookmark == -1 || storedBookmark > bookmark)) { // e.g. usefull for undo Nykthos, Shrine to Nyx
setStoredBookmark(bookmark);
} else {
resetStoredBookmark(game);
}
return true;
}
@ -1366,6 +1368,17 @@ public abstract class PlayerImpl implements Player, Serializable {
//20091005 - 502.1
List<Permanent> phasedOut = game.getBattlefield().getPhasedOut(playerId);
for (Permanent permanent : game.getBattlefield().getPhasedIn(playerId)) {
// 502.15i When a permanent phases out, any local enchantments or Equipment
// attached to that permanent phase out at the same time. This alternate way of
// phasing out is known as phasing out "indirectly." An enchantment or Equipment
// that phased out indirectly won't phase in by itself, but instead phases in
// along with the card it's attached to.
for (UUID attachmentId : permanent.getAttachments()) {
Permanent attachment = game.getPermanent(attachmentId);
if (attachment != null) {
attachment.phaseOut(game);
}
}
permanent.phaseOut(game);
}
for (Permanent permanent : phasedOut) {