external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'm20' into 'master'

Browse Source 
M20

See merge request core-developers/forge!1890
This commit is contained in:
swordshine
2019-06-24 02:13:33 +00:00
parent 59d259e764 d6af23958e
commit 49e9f86f36
81 changed files with 753 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java
View File

@@ -140,17 +140,28 @@ public class DebuffEffect extends SpellAbilityEffect {
tgtC.addChangedCardKeywords(addedKW, removedKW, false, false, timestamp);
}
if (!sa.hasParam("Permanent")) {
game.getEndOfTurn().addUntil(new GameCommand() {
final GameCommand until = new GameCommand() {
private static final long serialVersionUID = 5387486776282932314L;
@Override
public void run() {
tgtC.removeChangedCardKeywords(timestamp);
}
});
};
addUntilCommand(sa, until);
}
}
} // debuffResolve
private static void addUntilCommand(final SpellAbility sa, GameCommand until) {
final Card host = sa.getHostCard();
final Game game = host.getGame();
if (sa.hasParam("UntilYourNextTurn")) {
game.getCleanup().addUntil(sa.getActivatingPlayer(), until);
} else {
game.getEndOfTurn().addUntil(until);
}
}
}