projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
This commit is contained in:
Light2
2014-05-01 21:08:20 +02:00
parent 62593b08de 12ca3ae661
commit 536b51d953
379 changed files with 5722 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+9 -3
View File
@@ -45,6 +45,7 @@ import com.sleepycat.persist.EntityCursor;
import protocol.swg.chat.ChatSystemMessage;
import net.engio.mbassy.bus.config.BusConfiguration;
import resources.common.BountyListItem;
import resources.common.RadialOptions;
import resources.common.ThreadMonitor;
import resources.objects.creature.CreatureObject;
@@ -221,6 +222,7 @@ public class NGECore {
private ObjectDatabase resourceRootsODB;
private ObjectDatabase resourceHistoryODB;
private ObjectDatabase swgObjectODB;
private ObjectDatabase bountiesODB;
public static boolean PACKET_DEBUG = false;
@@ -272,16 +274,16 @@ public class NGECore {
setGalaxyStatus(1);
swgObjectODB = new ObjectDatabase("swgobjects", true, true, true, SWGObject.class);
mailODB = new ObjectDatabase("mails", true, true, true, Mail.class);
guildODB = new ObjectDatabase("guild", true, true, true, GuildObject.class);
objectIdODB = new ObjectDatabase("oids", true, true, false, ObjectId.class);
objectIdODB = new ObjectDatabase("oids", true, true, true, ObjectId.class);
duplicateIdODB = new ObjectDatabase("doids", true, true, true, DuplicateId.class);
chatRoomODB = new ObjectDatabase("chatRooms", true, true, true, ChatRoom.class);
resourcesODB = new ObjectDatabase("resources", true, true, true, GalacticResource.class);
resourceRootsODB = new ObjectDatabase("resourceroots", true, true, true, ResourceRoot.class);
resourceHistoryODB = new ObjectDatabase("resourcehistory", true, true, true, GalacticResource.class);
auctionODB = new ObjectDatabase("auction", true, true, true, AuctionItem.class);
bountiesODB = new ObjectDatabase("bounties", true, true, true, BountyListItem.class);
// Services
loginService = new LoginService(this);
@@ -371,6 +373,7 @@ public class NGECore {
zoneDispatch.addService(bazaarService);
zoneDispatch.addService(lootService);
zoneDispatch.addService(mountService);
zoneDispatch.addService(housingService);
zoneDispatch.addService(playerCityService);
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
@@ -491,7 +494,6 @@ public class NGECore {
spawnService.loadDynamicGroups();;
spawnService.loadSpawnAreas();
housingService.loadHousingTemplates();
equipmentService.loadBonusSets();
retroService.run();
@@ -628,6 +630,10 @@ public class NGECore {
return chatRoomODB;
}
public ObjectDatabase getBountiesODB() {
return bountiesODB;
}
public ObjectDatabase getResourcesODB() {
return resourcesODB;
}