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

* Added return code to addCounter method.

Browse source
This commit is contained in:
LevelX2 2016-08-11 17:40:51 +02:00
parent 5ee29a14e6
commit 058d25fa56
5 changed files with 52 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -653,12 +653,13 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
}
@Override
public void addCounters(String name, int amount, Game game) {
addCounters(name, amount, game, null);
public boolean addCounters(String name, int amount, Game game) {
return addCounters(name, amount, game, null);
}
@Override
public void addCounters(String name, int amount, Game game, ArrayList<UUID> appliedEffects) {
public boolean addCounters(String name, int amount, Game game, ArrayList<UUID> appliedEffects) {
boolean returnCode = true;
GameEvent countersEvent = GameEvent.getEvent(GameEvent.EventType.ADD_COUNTERS, objectId, ownerId, name, amount);
countersEvent.setAppliedEffects(appliedEffects);
if (!game.replaceEvent(countersEvent)) {
@ -668,18 +669,24 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
if (!game.replaceEvent(event)) {
game.getState().getCardState(this.objectId).getCounters().addCounter(name, 1);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER_ADDED, objectId, ownerId, name, 1));
} else {
returnCode = false;
}
}
} else {
returnCode = false;
}
return returnCode;
}
@Override
public void addCounters(Counter counter, Game game) {
addCounters(counter, game, null);
public boolean addCounters(Counter counter, Game game) {
return addCounters(counter, game, null);
}
@Override
public void addCounters(Counter counter, Game game, ArrayList<UUID> appliedEffects) {
public boolean addCounters(Counter counter, Game game, ArrayList<UUID> appliedEffects) {
boolean returnCode = true;
GameEvent countersEvent = GameEvent.getEvent(GameEvent.EventType.ADD_COUNTERS, objectId, ownerId, counter.getName(), counter.getCount());
countersEvent.setAppliedEffects(appliedEffects);
if (!game.replaceEvent(countersEvent)) {
@ -692,9 +699,14 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
if (!game.replaceEvent(event)) {
game.getState().getCardState(this.objectId).getCounters().addCounter(eventCounter);
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.COUNTER_ADDED, objectId, ownerId, counter.getName(), 1));
} else {
returnCode = false;
}
}
} else {
returnCode = false;
}
return returnCode;
}
@Override