github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-11 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-09-24 00:28:21 +02:00
commit eb842e3219
3 changed files with 3 additions and 2 deletions

2
Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerControlsPredicate.java
View file

@ -40,7 +40,7 @@ public class DefendingPlayerControlsPredicate implements ObjectSourcePlayerPredi
@Override
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
return input.getObject().getControllerId().equals(game.getCombat().getDefenderId(input.getSourceId()));
return input.getObject().getControllerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId()));
}
@Override

2
Mage/src/main/java/mage/filter/predicate/permanent/DefendingPlayerOwnsCardPredicate.java
View file

@ -40,7 +40,7 @@ public class DefendingPlayerOwnsCardPredicate implements ObjectSourcePlayerPredi
@Override
public boolean apply(ObjectSourcePlayer<Card> input, Game game) {
return input.getObject().getOwnerId().equals(game.getCombat().getDefenderId(input.getSourceId()));
return input.getObject().getOwnerId().equals(game.getCombat().getDefendingPlayerId(input.getSourceId()));
}
@Override

1
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1108,6 +1108,7 @@ public abstract class PlayerImpl implements Player, Serializable {
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATE_ABILITY, ability.getId(), ability.getSourceId(), playerId))) {
int bookmark = game.bookmarkState();
ability.newId();
ability.setControllerId(playerId);
game.getStack().push(new StackAbility(ability, playerId));
if (ability.activate(game, false)) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATED_ABILITY, ability.getId(), ability.getSourceId(), playerId));