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

Merge origin/master

Browse source
This commit is contained in:
fireshoes 2015-11-05 09:05:50 -06:00
commit 4cf957a4a9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/riseoftheeldrazi/NotOfThisWorld.java
View file

@ -103,10 +103,7 @@ class TargetStackObjectTargetingControlledPermanent extends TargetObject {
@Override @Override
public boolean canTarget(UUID id, Ability source, Game game) { public boolean canTarget(UUID id, Ability source, Game game) {
StackObject stackObject = game.getStack().getStackObject(id); StackObject stackObject = game.getStack().getStackObject(id);
if ((stackObject instanceof Spell) || (stackObject instanceof StackAbility)) { return (stackObject instanceof Spell) || (stackObject instanceof StackAbility);
return true;
}
return false;
} }
@Override @Override

3
Mage/src/mage/game/stack/SpellStack.java
View file

@ -105,6 +105,9 @@ public class SpellStack extends ArrayDeque<StackObject> {
counteredObjectName = "Ability (" + stackObject.getStackAbility().getRule(targetSourceName) + ") of " + targetSourceName; counteredObjectName = "Ability (" + stackObject.getStackAbility().getRule(targetSourceName) + ") of " + targetSourceName;
} }
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER, objectId, sourceId, stackObject.getControllerId()))) { if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER, objectId, sourceId, stackObject.getControllerId()))) {
if (!(stackObject instanceof Spell)) { // spells are removed from stack by the card movement
this.remove(stackObject);
}
stackObject.counter(sourceId, game, zone, owner, onTop); stackObject.counter(sourceId, game, zone, owner, onTop);
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(counteredObjectName + " is countered by " + sourceObject.getLogName()); game.informPlayers(counteredObjectName + " is countered by " + sourceObject.getLogName());