external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

GameEntityCounterTable: fix NPE and filterToRemove

Browse Source
This commit is contained in:
Hans Mackowiak
2021-04-21 17:34:47 +02:00
parent ab5f5c1ce9
commit ef8076b626
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/GameEntityCounterTable.java
View File

@@ -41,7 +41,11 @@ public class GameEntityCounterTable extends ForwardingTable<Optional<Player>, Ga
public int get(Player putter, GameEntity object, CounterType type) { public int get(Player putter, GameEntity object, CounterType type) {
Optional<Player> o = Optional.fromNullable(putter); Optional<Player> o = Optional.fromNullable(putter);
return ObjectUtils.firstNonNull(get(o, object).get(type), 0); Map<CounterType, Integer> map = get(o, object);
if (map == null || !map.containsKey(type)) {
return 0;
}
return ObjectUtils.firstNonNull(map.get(type), 0);
} }
public int totalValues() { public int totalValues() {
@@ -59,7 +63,7 @@ public class GameEntityCounterTable extends ForwardingTable<Optional<Player>, Ga
*/ */
public Map<CounterType, Integer> filterToRemove(GameEntity ge) { public Map<CounterType, Integer> filterToRemove(GameEntity ge) {
Map<CounterType, Integer> result = Maps.newHashMap(); Map<CounterType, Integer> result = Maps.newHashMap();
if (!containsRow(ge)) { if (!containsColumn(ge)) {
result.putAll(ge.getCounters()); result.putAll(ge.getCounters());
return result; return result;
} }