External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some tests for rollback (#2072). Could not reproduce any problems yet.

Browse source
This commit is contained in:
LevelX2 2016-10-12 18:54:15 +02:00
parent baeaaa3eb7
commit 316b1848c4
8 changed files with 253 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/ControllerGotLifeCount.java
View file

@ -59,7 +59,7 @@ public class ControllerGotLifeCount implements DynamicValue, MageSingleton {
}
public int calculate(Game game, UUID controllerId) {
PlayerGainedLifeWatcher watcher = (PlayerGainedLifeWatcher) game.getState().getWatchers().get("PlayerGainedLifeWatcher");
PlayerGainedLifeWatcher watcher = (PlayerGainedLifeWatcher) game.getState().getWatchers().get(PlayerGainedLifeWatcher.class.getName());
if (watcher != null) {
return watcher.getLiveGained(controllerId);
}

14
Mage/src/main/java/mage/watchers/common/PlayerGainedLifeWatcher.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.watchers.common;
import java.util.HashMap;
@ -37,8 +36,6 @@ import mage.game.Game;
import mage.game.events.GameEvent;
import mage.watchers.Watcher;
/**
* Counts amount of life gained during the current turn by players.
*
@ -47,11 +44,10 @@ import mage.watchers.Watcher;
*/
public class PlayerGainedLifeWatcher extends Watcher {
private Map<UUID, Integer> amountOfLifeGainedThisTurn = new HashMap<UUID, Integer>();
private final Map<UUID, Integer> amountOfLifeGainedThisTurn = new HashMap<>();
public PlayerGainedLifeWatcher() {
super("PlayerGainedLifeWatcher", WatcherScope.GAME);
super(PlayerGainedLifeWatcher.class.getName(), WatcherScope.GAME);
}
public PlayerGainedLifeWatcher(final PlayerGainedLifeWatcher watcher) {
@ -71,9 +67,9 @@ public class PlayerGainedLifeWatcher extends Watcher {
if (playerId != null) {
Integer amount = amountOfLifeGainedThisTurn.get(playerId);
if (amount == null) {
amount = Integer.valueOf(event.getAmount());
amount = event.getAmount();
} else {
amount = Integer.valueOf(amount + event.getAmount());
amount = amount + event.getAmount();
}
amountOfLifeGainedThisTurn.put(playerId, amount);
}
@ -83,7 +79,7 @@ public class PlayerGainedLifeWatcher extends Watcher {
public int getLiveGained(UUID playerId) {
Integer amount = amountOfLifeGainedThisTurn.get(playerId);
if (amount != null) {
return amount.intValue();
return amount;
}
return 0;
}