projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-30 00:15:50 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/projectswg/core3

Browse Source 
Conflicts:
	nge.backup
This commit is contained in:
Obique
2014-12-08 00:20:38 -06:00
committed by Obique
parent 63e7d45cf3 0979eb7dc2
commit 1595e396be
6 changed files with 147 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+5
View File
@@ -27,6 +27,7 @@ import resources.objects.intangible.IntangibleObject;
import resources.objects.player.PlayerObject;
import resources.objects.quadtree.QuadTree;
import resources.objects.tangible.TangibleObject;
import resources.objects.waypoint.WaypointObject;
import resources.player.Player;
import resources.server_info.ObjectDatabase;
import resources.server_info.ObjectDatabase.Traverser;
@@ -176,6 +177,7 @@ public class ObjectManager extends Manager {
case "player": return createPlayerObject(objectId, template);
case "tangible": return createTangibleObject(objectId, template);
case "intangible": return createIntangibleObject(objectId, template);
case "waypoint": return createWaypointObject(objectId, template);
case "weapon": break;
case "building": break;
case "cell": break;
@@ -205,4 +207,7 @@ public class ObjectManager extends Manager {
return new IntangibleObject(objectId);
}
private WaypointObject createWaypointObject(long objectId, String template) {
return new WaypointObject(objectId);
}
}