Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fix the counter removal code so it doesn't throw events when it's removing nonexistent counters.

Browse source
This commit is contained in:
Dilnu 2016-11-21 07:39:47 -05:00
parent 5e12a141cb
commit 9ff3e2c670
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/counters/Counters.java
View file

@ -74,26 +74,30 @@ public class Counters extends HashMap<String, Counter> implements Serializable {
}
}
public void removeCounter(String name) {
removeCounter(name, 1);
public boolean removeCounter(String name) {
return removeCounter(name, 1);
}
public void removeCounter(CounterType counterType, int amount) {
public boolean removeCounter(CounterType counterType, int amount) {
if (this.containsKey(counterType.getName())) {
get(counterType.getName()).remove(amount);
if (get(counterType.getName()).count == 0) {
this.remove(counterType.getName());
}
}
return true;
}
return false;
}
public void removeCounter(String name, int amount) {
public boolean removeCounter(String name, int amount) {
if (this.containsKey(name)) {
this.get(name).remove(amount);
if (this.get(name).getCount() == 0) {
this.remove(name);
}
return true;
}
return false;
}
public void removeAllCounters(CounterType counterType){