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

first commit of addidtions

Browse Source
This commit is contained in:
CharonInferar
2014-04-13 22:29:02 +02:00
parent 161a0a8859
commit 1decfaa081
4 changed files with 220 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+17 -16
View File
@@ -98,14 +98,17 @@ import main.NGECore;
import resources.objects.Delta;
import resources.objects.building.BuildingObject;
import resources.objects.cell.CellObject;
import resources.objects.craft.DraftSchematic;
import resources.objects.creature.CreatureObject;
import resources.objects.deed.Harvester_Deed;
import resources.objects.deed.Player_House_Deed;
import resources.objects.factorycrate.FactoryCrateObject;
import resources.objects.group.GroupObject;
import resources.objects.guild.GuildObject;
import resources.objects.harvester.HarvesterObject;
import resources.objects.installation.InstallationObject;
import resources.objects.intangible.IntangibleObject;
import resources.objects.manufacture.ManufactureSchematicObject;
import resources.objects.mission.MissionObject;
import resources.objects.player.PlayerObject;
import resources.objects.resource.GalacticResource;
@@ -385,6 +388,18 @@ public class ObjectService implements INetworkDispatch {
object = new ResourceContainerObject(objectID, planet, Template, position, orientation);
} else if(Template.startsWith("object/factory/shared_factory_crate")) {
object = new FactoryCrateObject(objectID, planet, Template, position, orientation);
} else if(Template.startsWith("object/draft_schematic")) {
object = new DraftSchematic(objectID, planet, Template, position, orientation);
} else if(Template.startsWith("object/manufacture_schematic")) {
object = new ManufactureSchematicObject(objectID, planet, Template, position, orientation);
} else if(Template.startsWith("object/installation/mining_ore/construction")) {
float positionY = core.terrainService.getHeight(planet.getID(), position.x, position.z)-1f;
@@ -655,24 +670,10 @@ public class ObjectService implements INetworkDispatch {
}
public CreatureObject getCreatureFromDB(long objectId) {
CreatureObject object = core.getCreatureODB().get(new Long(objectId), Long.class, CreatureObject.class);
if (object != null && getObject(object.getObjectID()) == null) {
loadServerTemplate(object);
object.viewChildren(object, true, true, new Traverser() {
public void process(SWGObject child) {
loadServerTemplate(child);
}
});
}
return object;
return core.getCreatureODB().get(new Long(objectId), Long.class, CreatureObject.class);
}
public long generateObjectID() {
private long generateObjectID() {
/*Random random = new Random();
long objectID = random.nextInt();