forked from External/mage
Fixed various Word of Command bugs, implemented mana pool restore methods
This commit is contained in:
parent
9a5b574c0c
commit
cb7c222eb9
6 changed files with 62 additions and 41 deletions
|
|
@ -36,17 +36,12 @@ public class SpellStack extends ArrayDeque<StackObject> {
|
|||
StackObject top = null;
|
||||
try {
|
||||
top = this.peek();
|
||||
Spell topSpell = getSpell(top.getId());
|
||||
if (topSpell != null) {
|
||||
top.resolve(game);
|
||||
game.resetControlAfterSpellResolve(topSpell);
|
||||
} else {
|
||||
top.resolve(game);
|
||||
}
|
||||
top.resolve(game);
|
||||
game.resetControlAfterSpellResolve(top.getId());
|
||||
} finally {
|
||||
if (top != null) {
|
||||
if (contains(top)) {
|
||||
logger.warn("StackObject was still on the stack after resoving" + top.getName());
|
||||
logger.warn("StackObject was still on the stack after resolving" + top.getName());
|
||||
this.remove(top, game);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue