Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance

src/resources/commands/Command.java

@@ -35,7 +35,7 @@ public class Command {
 	// defaultPriority
 	private String scriptCallback;
 	// fail
-	private Class javaCallback;
+	private Class<? extends ICmdCallback> javaCallback;
 	// fail
 	private float defaultTime;
 	private String characterAbility;
@@ -74,7 +74,7 @@ public class Command {
 	public void setName(String name) { this.name = name; }
 	public String getScriptCallback() { return scriptCallback; }
 	public void setScriptCallback(String scriptCallback) { this.scriptCallback = scriptCallback; }
-	public Class getJavaCallback() { return javaCallback; }
+	public Class<? extends ICmdCallback> getJavaCallback() { return javaCallback; }
 	public <T extends ICmdCallback> void setJavaCallback(Class<T> javaCallback) { this.javaCallback = javaCallback; }
 	public boolean hasJavaCallback() { return javaCallback != null; }
 	public float getDefaultTime() { return defaultTime; }

src/services/map/MapService.java

@@ -69,13 +69,15 @@ public class MapService extends Service {
 		staticMapLocations = new ConcurrentHashMap<>();
 		dynamicMapLocations = new ConcurrentHashMap<>();
 		persistentMapLocations = new ConcurrentHashMap<>();
+		// Needs to be done here as ObjectManager is initialized before MapService otherwise there won't be any map locations
+		// for objects loaded from the databases, snapshots, buildouts.
+		loadMapCategories();
+		loadMappingTemplates();
 	}
 
 	@Override
 	public boolean initialize() {
 		registerForIntent(GalacticPacketIntent.TYPE);
-		loadMapCategories();
-		loadMappingTemplates();
 		loadStaticCityPoints();
 		return super.initialize();
 	}