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

Merge pull request #2899 from tool4ever/fixsba

Browse Source 
Effect cleanup can prevent any LTB trigger
This commit is contained in:
Anthony Calosa
2023-04-22 07:22:10 +08:00
committed by GitHub
parent ad7598428f 7ab19408bd
commit 900f461b28
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -1439,6 +1439,8 @@ public class GameAction {
} }
setHoldCheckingStaticAbilities(false); setHoldCheckingStaticAbilities(false);
// important to collect first otherwise if a static fires it will mess up registered ones from LKI
game.getTriggerHandler().collectTriggerForWaiting();
if (game.getTriggerHandler().runWaitingTriggers()) { if (game.getTriggerHandler().runWaitingTriggers()) {
checkAgain = true; checkAgain = true;
} }

3
forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
View File

@@ -68,6 +68,9 @@ public class RollDiceEffect extends SpellAbilityEffect {
return rollDiceForPlayer(sa, player, amount, sides, 0, 0, null); return rollDiceForPlayer(sa, player, amount, sides, 0, 0, null);
} }
private static int rollDiceForPlayer(SpellAbility sa, Player player, int amount, int sides, int ignore, int modifier, List<Integer> rollsResult) { private static int rollDiceForPlayer(SpellAbility sa, Player player, int amount, int sides, int ignore, int modifier, List<Integer> rollsResult) {
if (amount == 0) {
return 0;
}
int advantage = getRollAdvange(player); int advantage = getRollAdvange(player);
amount += advantage; amount += advantage;
int total = 0; int total = 0;

2
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -180,7 +180,7 @@ public class TriggerHandler {
return FileSection.parseToMap(trigParse, FileSection.DOLLAR_SIGN_KV_SEPARATOR); return FileSection.parseToMap(trigParse, FileSection.DOLLAR_SIGN_KV_SEPARATOR);
} }
private void collectTriggerForWaiting() { public void collectTriggerForWaiting() {
for (final TriggerWaiting wt : waitingTriggers) { for (final TriggerWaiting wt : waitingTriggers) {
if (wt.getTriggers() != null) if (wt.getTriggers() != null)
continue; continue;