projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-28 23:15:53 -04:00
Code Issues Projects Releases Wiki Activity

Refactored TANO

Browse Source
This commit is contained in:
Treeku
2014-05-14 14:57:49 +01:00
parent f9c542063a
commit c564a016e4
12 changed files with 410 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+7 -8
View File
@@ -129,7 +129,6 @@ import services.bazaar.AuctionItem;
import services.chat.ChatRoom;
@SuppressWarnings("unused")
public class ObjectService implements INetworkDispatch {
private Map<Long, SWGObject> objectList = new ConcurrentHashMap<Long, SWGObject>();
@@ -241,11 +240,11 @@ public class ObjectService implements INetworkDispatch {
} else if(Template.startsWith("object/tangible/survey_tool")) {
object = new SurveyTool(objectID, planet, Template, position, orientation);
object = new SurveyTool(objectID, planet, position, orientation, Template);
} else if(Template.startsWith("object/tangible")) {
object = new TangibleObject(objectID, planet, Template, position, orientation);
object = new TangibleObject(objectID, planet, position, orientation, Template);
} else if(Template.startsWith("object/intangible")) {
@@ -253,7 +252,7 @@ public class ObjectService implements INetworkDispatch {
} else if(Template.startsWith("object/weapon")) {
object = new WeaponObject(objectID, planet, Template, position, orientation);
object = new WeaponObject(objectID, planet, position, orientation, Template);
} else if(Template.startsWith("object/building") || Template.startsWith("object/static/worldbuilding/structures") || Template.startsWith("object/static/structure")){
@@ -297,11 +296,11 @@ public class ObjectService implements INetworkDispatch {
} else if(Template.startsWith("object/resource_container")) {
object = new ResourceContainerObject(objectID, planet, Template, position, orientation);
object = new ResourceContainerObject(objectID, planet, position, orientation, Template);
} else if(Template.startsWith("object/factory/shared_factory_crate")) {
object = new FactoryCrateObject(objectID, planet, Template, position, orientation);
object = new FactoryCrateObject(objectID, planet, position, orientation, Template);
} else if(Template.startsWith("object/draft_schematic")) {
@@ -315,7 +314,7 @@ public class ObjectService implements INetworkDispatch {
float positionY = core.terrainService.getHeight(planet.getID(), position.x, position.z)-1f;
Point3D newpoint = new Point3D(position.x,positionY,position.z);
object = new InstallationObject(objectID, planet, Template, newpoint, orientation);
object = new InstallationObject(objectID, planet, newpoint, orientation, Template);
} else if(Template.startsWith("object/installation/mining_ore") || Template.startsWith("object/installation/mining_liquid") ||
Template.startsWith("object/installation/mining_gas") || Template.startsWith("object/installation/mining_organic") ||
@@ -323,7 +322,7 @@ public class ObjectService implements INetworkDispatch {
float positionY = core.terrainService.getHeight(planet.getID(), position.x, position.z)-1f;
Point3D newpoint = new Point3D(position.x,positionY,position.z);
object = new HarvesterObject(objectID, planet, Template, newpoint, orientation);
object = new HarvesterObject(objectID, planet, newpoint, orientation, Template);
} else {
return null;