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

- Use updateAbilityTextForView as a limited form of updating the text part of the view in order to update changed card text (e.g. lands affected by Blood Moon, creatures affected by Humility) while avoiding flickering side effects.

Browse Source 
- Volrath's Shapeshifter: fixed a concurrent modification when removing temporary triggers.
This commit is contained in:
Agetian
2017-08-26 17:12:08 +00:00
parent 710ac14202
commit 586abb5466
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/StaticEffect.java
View File

@@ -1063,7 +1063,8 @@ public class StaticEffect {
if (removeMayPlay) {
affectedCard.removeMayPlay(ability);
}
//affectedCard.updateStateForView(); // FIXME: causes intolerable flickering for cards such as Thassa, God of the Sea or Wind Zendikon
affectedCard.updateAbilityTextForView(); // only update keywords and text for view to avoid flickering
}
return affectedCards;
}

9
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -476,11 +476,15 @@ public final class StaticAbilityContinuous {
// Restore the original text in case it was remembered before
if (affectedCard.getStates().contains(CardStateName.OriginalText)) {
affectedCard.clearTriggersNew();
List<SpellAbility> saToRemove = Lists.newArrayList();
for (SpellAbility saTemp : affectedCard.getSpellAbilities()) {
if (saTemp.isTemporary()) {
affectedCard.removeSpellAbility(saTemp);
saToRemove.add(saTemp);
}
}
for (SpellAbility saRem : saToRemove) {
affectedCard.removeSpellAbility(saRem);
}
CardFactory.copyState(affectedCard, CardStateName.OriginalText, affectedCard, CardStateName.Original, false);
}
@@ -516,7 +520,6 @@ public final class StaticAbilityContinuous {
affectedCard.getCurrentState().addStaticAbility(stAb);
}
}
affectedCard.updateAbilityTextForView();
}
// Change color words
@@ -723,7 +726,7 @@ public final class StaticAbilityContinuous {
affectedCard.setMayPlay(mayPlayController, mayPlayWithoutManaCost, mayPlayWithFlash, mayPlayGrantZonePermissions, stAb);
}
//affectedCard.updateStateForView(); // FIXME: causes intolerable flickering for cards such as Thassa, God of the Sea or Wind Zendikon.
affectedCard.updateAbilityTextForView(); // only update keywords and text for view to avoid flickering
}
return affectedCards;