projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
This commit is contained in:
Light2
2013-12-04 19:13:08 +01:00
parent b22b1d818d d3d9dcc461
commit 470215c05d
25 changed files with 1556 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+10 -6
View File
@@ -36,11 +36,6 @@ import java.util.concurrent.TimeUnit;
import net.engio.mbassy.bus.config.BusConfiguration;
import resources.common.RadialOptions;
import resources.common.ThreadMonitor;
import resources.objects.creature.CreatureObject;
@@ -61,9 +56,11 @@ import services.StaticService;
import services.TerrainService;
import services.WeatherService;
import services.chat.ChatService;
import services.collections.CollectionService;
import services.combat.CombatService;
import services.command.CombatCommand;
import services.command.CommandService;
import services.gcw.FactionService;
import services.gcw.GCWService;
import services.guild.GuildService;
import services.map.MapService;
@@ -118,6 +115,7 @@ public class NGECore {
public ConnectionService connectionService;
public CommandService commandService;
public CharacterService characterService;
public FactionService factionService;
public ObjectService objectService;
public MapService mapService;
public UpdateService updateService;
@@ -139,6 +137,7 @@ public class NGECore {
public SkillModService skillModService;
public EquipmentService equipmentService;
public TravelService travelService;
public CollectionService collectionService;
public EntertainmentService entertainmentService;
public WeatherService weatherService;
@@ -197,7 +196,8 @@ public class NGECore {
characterService = new CharacterService(this);
mapService = new MapService(this);
travelService = new TravelService(this);
factionService = new FactionService(this);
objectService = new ObjectService(this);
terrainService = new TerrainService(this);
updateService = new UpdateService(this);
@@ -235,6 +235,7 @@ public class NGECore {
zoneDispatch = new NetworkDispatch(this, true);
zoneDispatch.addService(connectionService);
zoneDispatch.addService(characterService);
zoneDispatch.addService(factionService);
zoneDispatch.addService(objectService);
zoneDispatch.addService(commandService);
zoneDispatch.addService(chatService);
@@ -282,6 +283,9 @@ public class NGECore {
gcwService = new GCWService(this);
zoneDispatch.addService(gcwService);
collectionService = new CollectionService(this);
zoneDispatch.addService(collectionService);
tradeService = new TradeService(this);
zoneDispatch.addService(tradeService);