External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor improvements to AddCountersAllEffect (#11690)

Browse source 
* Basic cleanup (remove unused imports, make class variable final, fix typo in comment)

* Reduce log spam, use plural for "counter" when necessary
This commit is contained in:
Cameron Merkel 2024-01-20 12:35:13 -06:00 • committed by GitHub
parent f3fe98f8d0
commit 0c9518712a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersAllEffect.java
View file

@ -2,7 +2,6 @@ package mage.abilities.effects.common.counter;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
@ -12,7 +11,6 @@ import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.util.CardUtil;
/**
* @author North
@ -20,7 +18,7 @@ import mage.util.CardUtil;
public class AddCountersAllEffect extends OneShotEffect {
private final Counter counter;
private DynamicValue amount;
private final DynamicValue amount;
private final FilterPermanent filter;
public AddCountersAllEffect(Counter counter, FilterPermanent filter) {
@ -50,7 +48,7 @@ public class AddCountersAllEffect extends OneShotEffect {
if (counter != null) {
for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source, game)) {
Counter newCounter = counter.copy();
int calculated = amount.calculate(game, source, this); // 0 -- you must use default couner
int calculated = amount.calculate(game, source, this); // 0 -- you must use default counter
if (calculated < 0) {
continue;
} else if (calculated == 0) {
@ -62,9 +60,9 @@ public class AddCountersAllEffect extends OneShotEffect {
}
permanent.addCounters(newCounter, source.getControllerId(), source, game);
if (!game.isSimulation()) {
if (!game.isSimulation() && newCounter.getCount() > 0) {
game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " puts " + newCounter.getCount() + ' ' + newCounter.getName()
+ " counter on " + permanent.getLogName());
+ (newCounter.getCount() == 1 ? " counter" : " counters") + " on " + permanent.getLogName());
}
}
}