From a2caea0a83af1022c43bc7624682184787091960 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Sun, 27 Oct 2013 15:29:27 +0100
Subject: [PATCH] Refactor: Flatten some forward-arrow-pattern ifs to vertical
 code

---
 .../AndorsTrail/model/map/MapCollection.java  |  2 +-
 .../AndorsTrail/model/map/PredefinedMap.java  | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
index d0a9c6a31..2df6ef90e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
@@ -82,7 +82,7 @@ public final class MapCollection {
 		}
 	}
 
-	private static boolean shouldSaveMap(WorldContext world, PredefinedMap map) {
+	public static boolean shouldSaveMap(WorldContext world, PredefinedMap map) {
 		if (map.visited) return true;
 		if (map.shouldSaveMapData(world)) return true;
 		return false;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index fe0bd8b42..9c9dc7d25 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -71,7 +71,9 @@ public final class PredefinedMap {
 	public MapObject findEventObject(MapObject.MapObjectType objectType, String name) {
 		for (MapObject o : eventObjects) {
 			if (!o.isActive) continue;
-			if (o.type == objectType && name.equals(o.id)) return o;
+			if (o.type != objectType) continue;
+			if (!name.equals(o.id)) continue;
+			return o;
 		}
 		return null;
 	}
@@ -79,21 +81,18 @@ public final class PredefinedMap {
 		List<MapObject> result = null;
 		for (MapObject o : eventObjects) {
 			if (!o.isActive) continue;
-			if (o.position.contains(p)) {
-				if (result == null) result = new ArrayList<MapObject>();
-				result.add(o);
-			}
+			if (!o.position.contains(p)) continue;
+			if (result == null) result = new ArrayList<MapObject>();
+			result.add(o);
 		}
 		return result;
 	}
 	public boolean hasContainerAt(final Coord p) {
 		for (MapObject o : eventObjects) {
 			if (!o.isActive) continue;
-			if (o.type == MapObject.MapObjectType.container) {
-				if (o.position.contains(p)) {
-					return true;
-				}
-			}
+			if (o.type != MapObject.MapObjectType.container) continue;
+			if (!o.position.contains(p)) continue;
+			return true;
 		}
 		return false;
 	}