github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed kicker costs not getting reset correctly (fixes #8495)

Browse source
This commit is contained in:
Daniel Bomar 2021-12-03 19:10:02 -06:00
parent 17d9f080f9
commit a8f7cfa17d
No known key found for this signature in database
GPG key ID: C86C8658F4023918
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/main/java/mage/abilities/keyword/KickerAbility.java
View file

@ -115,18 +115,11 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
});
}
public void resetKicker(Game game, Ability source) {
private void resetKicker() {
for (OptionalAdditionalCost cost : kickerCosts) {
cost.reset();
}
String key = getActivationKey(source, "", game);
for (Iterator<String> iterator = activations.keySet().iterator(); iterator.hasNext(); ) {
String activationKey = iterator.next();
if (activationKey.startsWith(key)
&& activations.get(activationKey) > 0) {
activations.put(key, 0);
}
}
activations.clear();
}
private int getKickedCounterStrict(Game game, Ability source, String needKickerCost) {
@ -241,7 +234,7 @@ public class KickerAbility extends StaticAbility implements OptionalAdditionalSo
if (ability instanceof SpellAbility) {
Player player = game.getPlayer(ability.getControllerId());
if (player != null) {
this.resetKicker(game, ability);
this.resetKicker();
for (OptionalAdditionalCost kickerCost : kickerCosts) {
boolean again = true;
while (player.canRespond() && again) {