refactor of watchers to use map functions

This commit is contained in:
ingmargoudt 2017-02-15 23:19:40 +01:00
parent fbbfc6c611
commit 4aa51210f9
18 changed files with 69 additions and 158 deletions

View file

@ -33,9 +33,7 @@ import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.watchers.Watcher;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.*;
/**
* Watcher stores which sources did damage to anything.
@ -44,7 +42,7 @@ import java.util.UUID;
*/
public class SourceDidDamageWatcher extends Watcher {
public final List<UUID> damageSources = new ArrayList<>();
public final Set<UUID> damageSources = new HashSet<>();
public SourceDidDamageWatcher() {
super("SourceDidDamageWatcher", WatcherScope.GAME);
@ -65,9 +63,8 @@ public class SourceDidDamageWatcher extends Watcher {
if (event.getType() == EventType.DAMAGED_CREATURE
|| event.getType() == EventType.DAMAGED_PLANESWALKER
|| event.getType() == EventType.DAMAGED_PLAYER) {
if (!damageSources.contains(event.getSourceId())) {
damageSources.add(event.getSourceId());
}
}
}