Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed a problem with token P/T reset (fixes the problem with Tree of Perdition and Soul Separator).

Browse source
This commit is contained in:
LevelX2 2016-09-08 17:15:40 +02:00
parent 0af7871804
commit 21baa14404
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/game/permanent/PermanentToken.java
View file

@ -49,6 +49,8 @@ public class PermanentToken extends PermanentImpl {
this.token = token.copy();
this.token.getAbilities().newId(); // neccessary if token has ability like DevourAbility()
this.token.getAbilities().setSourceId(objectId);
this.power.modifyBaseValue(token.getPower().getBaseValueModified());
this.toughness.modifyBaseValue(token.getToughness().getBaseValueModified());
this.copyFromToken(this.token, game, false); // needed to have at this time (e.g. for subtypes for entersTheBattlefield replacement effects)
}
@ -62,6 +64,9 @@ public class PermanentToken extends PermanentImpl {
public void reset(Game game) {
copyFromToken(token, game, true);
super.reset(game);
// Because the P/T objects have there own base value for reset we have to take it from there instead of from the basic token object
this.power.resetToBaseValue();
this.toughness.resetToBaseValue();
}
private void copyFromToken(Token token, Game game, boolean reset) {
@ -84,8 +89,6 @@ public class PermanentToken extends PermanentImpl {
this.color = token.getColor(game).copy();
this.frameColor = token.getFrameColor(game);
this.frameStyle = token.getFrameStyle();
this.power.modifyBaseValue(token.getPower().getBaseValueModified());
this.toughness.modifyBaseValue(token.getToughness().getBaseValueModified());
this.supertype = token.getSupertype();
this.subtype = token.getSubtype(game);
this.tokenDescriptor = token.getTokenDescriptor();