projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-11 01:13:02 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'quality_assurance' into buildout_tinkering

Browse Source
This commit is contained in:
Obique PSWG
2015-09-29 08:53:11 -05:00
parent d4879b98c4 dbdfd59539
commit 241d1c438c
9 changed files with 394 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/spawn/StaticService.java
+4 -5
View File
@@ -40,6 +40,7 @@ import resources.objects.SWGObject;
import resources.objects.building.BuildingObject;
import resources.server_info.Log;
import resources.server_info.RelationalServerData;
import resources.server_info.RelationalServerFactory;
import services.objects.ObjectManager;
public class StaticService extends Service {
@@ -55,12 +56,10 @@ public class StaticService extends Service {
this.databaseMutex = new Object();
this.objectManager = objectManager;
spawnDatabase = new RelationalServerData("serverdata/static/spawns.db");
if (!spawnDatabase.linkTableWithSdb("spawns", "serverdata/static/spawns.sdb") ||
!spawnDatabase.linkTableWithSdb("types", "serverdata/static/types.sdb")) {
spawnDatabase = RelationalServerFactory.getServerData("static/spawns.db", "spawns", "types");
if (spawnDatabase == null)
throw new main.ProjectSWG.CoreException("Unable to load sdb files for StaticService");
}
getSupportingStatement = spawnDatabase.prepareStatement(GET_SUPPORTING_SQL);
}