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

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2014-06-12 08:28:08 +02:00
parent a0ec9301cc
commit ec65c89267
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/mage/abilities/keyword/HauntAbility.java
View file

@ -176,13 +176,13 @@ class HauntEffect extends OneShotEffect {
Permanent hauntedCreature = game.getPermanent(targetPointer.getFirst(game, source));
// haunting card will only be moved to exile, if
if (hauntedCreature != null) {
if (card.moveToExile(source.getSourceId(), "Haunting", id, game)) {
if (card.moveToExile(source.getSourceId(), "Haunting", source.getSourceId(), game)) {
// remember the haunted creature
String key = new StringBuilder("Haunting_").append(source.getSourceId().toString()).append("_").append(card.getZoneChangeCounter()).toString();
game.getState().setValue(key, new FixedTarget(targetPointer.getFirst(game, source)));
card.addInfo("001", new StringBuilder("Haunting ").append(hauntedCreature.getName()).toString());
hauntedCreature.addInfo("001", new StringBuilder("Haunted by ").append(card.getName()).toString());
game.informPlayers(new StringBuilder(card.getName()).append(" haunting ").append(hauntedCreature.getName()).toString());
card.addInfo("hauntinfo", new StringBuilder("Haunting ").append(hauntedCreature.getLogName()).toString());
hauntedCreature.addInfo("hauntinfo", new StringBuilder("Haunted by ").append(card.getLogName()).toString());
game.informPlayers(new StringBuilder(card.getName()).append(" haunting ").append(hauntedCreature.getLogName()).toString());
}
return true;
}

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

@ -145,7 +145,7 @@ public abstract class PlayerImpl implements Player, Serializable {
protected int maxHandSize = 7;
protected int maxAttackedBy = Integer.MAX_VALUE;
protected ManaPool manaPool;
protected boolean passed;
protected boolean passed; // player passed priority
protected boolean passedTurn;
protected int turns;
protected int storedBookmark = -1;