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

Merge branch 'master' into darkk_ent

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
This commit is contained in:
darkk1138
2013-12-07 16:37:52 +01:00
parent 9683f4c164 21943d1934
commit 131092de60
129 changed files with 2348 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+15 -42
View File
@@ -77,6 +77,7 @@ import resources.objects.cell.CellObject;
import resources.objects.creature.CreatureObject;
import resources.objects.group.GroupObject;
import resources.objects.guild.GuildObject;
import resources.objects.mission.MissionObject;
import resources.objects.player.PlayerObject;
import resources.objects.staticobject.StaticObject;
import resources.objects.tangible.TangibleObject;
@@ -204,7 +205,11 @@ public class ObjectService implements INetworkDispatch {
object = new WaypointObject(objectID, planet, position);
} else {
} else if(Template.startsWith("object/mission")) {
object = new MissionObject(objectID, planet, Template);
} else {
return null;
@@ -349,18 +354,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;
}
@@ -454,10 +447,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));
}
}
}
@@ -570,32 +569,6 @@ public class ObjectService implements INetworkDispatch {
});
/*
objControllerOpcodes.put(ObjControllerOpcodes.USE_OBJECT, new INetworkRemoteEvent() {
@Override
public void handlePacket(IoSession session, IoBuffer buffer) throws Exception {
buffer.order(ByteOrder.LITTLE_ENDIAN);
CreatureObject creature = (CreatureObject) getObject(buffer.getLong());
if (creature == null || creature.getClient() == null) {
return;
}
buffer.skip(4);
SWGObject object = getObject(buffer.getLong());
if (object == null) {
return;
}
useObject(creature, object);
}
});
*/
}
public void shutdown() {