From a47c0adfdaaf3a1700bb1b267a31f19e1ff77326 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 21 Apr 2015 00:09:29 +0200 Subject: [PATCH] Some minor fixes. --- Mage.Common/src/mage/view/GameView.java | 2 +- Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index 03e9634cce3..467780abf1c 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -96,7 +96,7 @@ public class GameView implements Serializable { for (StackObject stackObject: state.getStack()) { if (stackObject instanceof StackAbility) { // Stack Ability - MageObject object = ((StackAbility)stackObject).getSourceObject(game); + MageObject object = game.getObject(stackObject.getSourceId()); Card card = game.getCard(stackObject.getSourceId()); if (card != null) { if (object != null) { diff --git a/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java b/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java index e392be49571..9f602c8dd56 100644 --- a/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java +++ b/Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java @@ -112,11 +112,11 @@ class WaveOfVitriolEffect extends OneShotEffect { if (player != null) { int count = 0; for(Permanent permanent: game.getBattlefield().getAllActivePermanents(filter, playerId, game)) { - if (permanent.getCardType().contains(CardType.LAND)) { + if (permanent.sacrifice(source.getSourceId(), game) && permanent.getCardType().contains(CardType.LAND)) { count++; } - permanent.sacrifice(source.getSourceId(), game); } + game.getState().handleSimultaneousEvent(game); if (count > 0 && player.chooseUse(Outcome.PutLandInPlay, "Search your library for up to " + count + " basic lands?", game)) { Target target = new TargetCardInLibrary(0,count, new FilterBasicLandCard()); player.chooseTarget(outcome, target, source, game); @@ -127,6 +127,7 @@ class WaveOfVitriolEffect extends OneShotEffect { } } player.shuffleLibrary(game); + game.getState().handleSimultaneousEvent(game); } } }