github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor fixes.

Browse source
This commit is contained in:
LevelX2 2015-04-21 00:09:29 +02:00
parent c2fb2de67a
commit a47c0adfda
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/view/GameView.java
View file

@ -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) {

5
Mage.Sets/src/mage/sets/commander2014/WaveOfVitriol.java
View file

@ -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);
}
}
}