github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Issue 169

Browse source
This commit is contained in:
magenoxx 2011-06-30 15:07:38 +04:00
parent ec79873a0d
commit 2dba0ca829
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/Ability.java
View file

@ -188,7 +188,7 @@ public interface Ability extends Serializable {
public Effects getEffects();
/**
* Retrieves the effects of the specified {@link Effecttype type} that are
* Retrieves the effects of the specified {@link EffectType type} that are
* put into place by the resolution of this ability.
*
* @param effectType The {@link EffectType type} to search for.

12
Mage/src/mage/game/permanent/PermanentImpl.java
View file

@ -57,6 +57,7 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
protected boolean flipped;
protected UUID originalControllerId;
protected UUID controllerId;
protected UUID beforeResetControllerId;
protected int damage;
protected boolean controlledFromStartOfTurn;
protected int turnsOnBattlefield;
@ -115,6 +116,7 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
@Override
public void reset(Game game) {
this.beforeResetControllerId = this.controllerId;
this.controllerId = originalControllerId;
this.maxBlocks = 1;
}
@ -351,8 +353,14 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
if (!controllerId.equals(this.controllerId)) {
Player newController = game.getPlayer(controllerId);
if (newController != null && (!newController.hasLeft() || !newController.hasLost())) {
this.removeFromCombat(game);
this.controlledFromStartOfTurn = false;
// changeControllerId can be called by continuous effect
// so it will lead to this.controlledFromStartOfTurn set to false over and over
// because of reset(game) method called before applying effect as state-based action
// that changes this.controllerId to original one (actually owner)
if (controllerId != beforeResetControllerId) {
this.removeFromCombat(game);
this.controlledFromStartOfTurn = false;
}
this.controllerId = controllerId;
this.abilities.setControllerId(controllerId);
return true;