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

Moved travel terminal spawns to starport template script, refactored loading of server templates

Browse Source
This commit is contained in:
Light2
2013-09-14 23:58:35 +02:00
parent aee55c457b
commit 73fa4ec5b2
10 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+15 -9
View File
@@ -187,33 +187,39 @@ public class ObjectService implements INetworkDispatch {
return null;
}
object.setPlanetId(planet.getID());
loadServerTemplate(object);
objectList.add(object);
String serverTemplate = Template.replace(".iff", "");
return object;
}
public void loadServerTemplate(SWGObject object) {
String template = object.getTemplate();
String serverTemplate = template.replace(".iff", "");
// check if template is empty(4 default lines) to reduce RAM usage(saves about 500 MB of RAM)
try {
int numberOfLines = FileUtilities.getNumberOfLines("scripts/" + serverTemplate.split("shared_" , 2)[0].replace("shared_", "") + serverTemplate.split("shared_" , 2)[1] + ".py");
if(numberOfLines > 4) {
if(serverTemplates.containsKey(Template)) {
PyObject func = serverTemplates.get(Template);
if(serverTemplates.containsKey(template)) {
PyObject func = serverTemplates.get(template);
func.__call__(Py.java2py(core), Py.java2py(object));
} else {
PyObject func = core.scriptService.getMethod("scripts/" + serverTemplate.split("shared_" , 2)[0].replace("shared_", ""), serverTemplate.split("shared_" , 2)[1], "setup");
func.__call__(Py.java2py(core), Py.java2py(object));
serverTemplates.put(Template, func);
serverTemplates.put(template, func);
}
}
} catch (IOException e) {
e.printStackTrace();
}
//core.scriptService.callScript("scripts/" + serverTemplate.split("shared_" , 2)[0].replace("shared_", ""), "setup", serverTemplate.split("shared_" , 2)[1], core, object);
objectList.add(object);
return object;
}
public SWGObject createObject(String Template, Planet planet) {