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

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

Browse Source
This commit is contained in:
Waverunner
2013-12-07 17:59:03 -05:00
parent ae0b06f917 7fbd1206ab
commit 576c03db14
100 changed files with 1671 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+14 -17
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package services.object;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.ByteOrder;
import java.sql.PreparedStatement;
@@ -220,7 +221,7 @@ public class ObjectService implements INetworkDispatch {
object.setAttachment("serverTemplate", ((customServerTemplate != null) ? customServerTemplate : object.getTemplate()));
object.setisInSnapshot(isSnapshot);
loadServerTemplate(object);
//loadServerTemplate(object);
objectList.put(objectID, object);
@@ -277,10 +278,12 @@ public class ObjectService implements INetworkDispatch {
}
}
} catch (FileNotFoundException e) {
System.out.println("!File Not Found:" + template.toString());
} catch (IOException e) {
System.out.println("!IO error " + template.toString());
e.printStackTrace();
}
}
public SWGObject createObject(String Template, Planet planet) {
@@ -352,18 +355,6 @@ public class ObjectService implements INetworkDispatch {
}
}
if (object instanceof CreatureObject) {
if (core.factionService.getFactionMap().containsKey(((CreatureObject) object).getFaction())) {
if (FileUtilities.doesFileExist(filePath)) {
PyObject method = core.scriptService.getMethod("scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", ""), object.getTemplate().split("shared_" , 2)[1].replace(".iff", ""), "destroy");
if (method != null && method.isCallable()) {
method.__call__(Py.java2py(core), Py.java2py(((TangibleObject) object).getKiller()), Py.java2py(object));
}
}
}
}
if (object == null) {
return;
}
@@ -457,10 +448,16 @@ public class ObjectService implements INetworkDispatch {
String filePath = "scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", "") + object.getTemplate().split("shared_" , 2)[1].replace(".iff", "") + ".py";
if (FileUtilities.doesFileExist(filePath)) {
PyObject method = core.scriptService.getMethod("scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", ""), object.getTemplate().split("shared_" , 2)[1].replace(".iff", ""), "useObject");
filePath = "scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", "");
String fileName = object.getTemplate().split("shared_" , 2)[1].replace(".iff", "");
if (method != null && method.isCallable()) {
method.__call__(Py.java2py(core), Py.java2py(creature), Py.java2py(object));
PyObject method1 = core.scriptService.getMethod("scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", ""), object.getTemplate().split("shared_" , 2)[1].replace(".iff", ""), "use");
PyObject method2 = core.scriptService.getMethod("scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", ""), object.getTemplate().split("shared_" , 2)[1].replace(".iff", ""), "useObject");
if (method1 != null && method1.isCallable()) {
method1.__call__(Py.java2py(core), Py.java2py(creature), Py.java2py(object));
} else if (method2 != null && method2.isCallable()) {
method2.__call__(Py.java2py(core), Py.java2py(creature), Py.java2py(object));
}
}
}