summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game/map
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-24 00:08:32 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-24 00:08:32 +0100
commite344ffce79051254d216c3add363805cd3a4892f (patch)
tree0d5bb88accda9de6d9f8475532473b93f1ed095e /core/src/ch/asynk/rustanddust/game/map
parent304923ce266bcfc6c52028b1b9f7342e7d4379a7 (diff)
downloadRustAndDust-e344ffce79051254d216c3add363805cd3a4892f.zip
RustAndDust-e344ffce79051254d216c3add363805cd3a4892f.tar.gz
ObjectiveSet: respond to isObjectiveFor() taking peristence into account
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/map')
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map0Hex.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java
index 41270d1..77780cd 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java
@@ -79,10 +79,7 @@ public abstract class Map0Hex extends Board implements ObjectiveSet.ObjectiveCb
@Override
public boolean isObjectiveFor(Tile tile, Pawn pawn)
{
- if (!objectives.containsKey(tile))
- return false;
-
- return (objectives.get(tile).faction() != pawn.getFaction());
+ return objectives.isObjectiveFor(tile, pawn);
}
@Override