External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

ACTIVATE_ABILITY and ACTIVATED_ABILITY events were used with source and target reversed.

Browse source
This commit is contained in:
North 2011-08-22 17:34:17 +03:00
parent 8fbc9da473
commit b2d9b467ef
6 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/mage/players/PlayerImpl.java
View file

@ -259,10 +259,12 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
}
}
@Override
public void setTurnControlledBy(UUID playerId) {
this.turnController = playerId;
}
@Override
public UUID getTurnControlledBy() {
return this.turnController;
}
@ -484,13 +486,13 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
protected boolean playAbility(ActivatedAbility ability, Game game) {
//20091005 - 602.2a
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATE_ABILITY, ability.getSourceId(), ability.getId(), playerId))) {
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATE_ABILITY, ability.getId(), ability.getSourceId(), playerId))) {
game.bookmarkState();
ability.newId();
game.getStack().push(new StackAbility(ability, playerId));
String message = ability.getActivatedMessage(game);
if (ability.activate(game, false)) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATED_ABILITY, ability.getSourceId(), ability.getId(), playerId));
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATED_ABILITY, ability.getId(), ability.getSourceId(), playerId));
game.fireInformEvent(name + message);
game.removeLastBookmark();
return true;