Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into CORE-252_Spawners

Conflicts:
	serverdata/spawn/static.sdf
	src/services/spawn/SpawnerService.java
This commit is contained in:
Mads Boddum
2015-09-08 14:27:02 +02:00
27 changed files with 1885 additions and 455 deletions
+1 -1
View File
@@ -66,7 +66,7 @@ public final class SpawnerService extends Service {
public boolean initialize() {
registerForIntent(ConfigChangedIntent.TYPE);
if (getConfig(ConfigFile.FEATURES).getBoolean("SPAWNERS-ENABLED", true))
if (getConfig(ConfigFile.FEATURES).getBoolean("SPAWNERS-ENABLED", false))
loadSpawners();
return super.initialize();