projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Fixed 3 classes

Browse Source
This commit is contained in:
CharonInferar
2014-04-06 04:19:24 +02:00
parent e448a41bb0
commit b5ba0bb688
3 changed files with 44 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+6 -6
View File
@@ -170,12 +170,12 @@ public class NGECore {
//public MissionService missionService;
public InstanceService instanceService;
public DevService devService;
<<<<<<< HEAD
public SurveyService surveyService;
public ResourceService resourceService;
=======
public ConversationService conversationService;
>>>>>>> origin/master
// Login Server
public NetworkDispatch loginDispatch;
@@ -199,16 +199,16 @@ public class NGECore {
private BusConfiguration eventBusConfig = BusConfiguration.Default(1, new ThreadPoolExecutor(1, 4, 1, TimeUnit.MINUTES, new LinkedBlockingQueue<Runnable>()));
private ObjectDatabase buildingODB;
<<<<<<< HEAD
private ObjectDatabase resourcesODB;
private ObjectDatabase resourceRootsODB;
private ObjectDatabase resourceHistoryODB;
public static boolean PACKET_DEBUG = false;
=======
>>>>>>> origin/master
public NGECore() {