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

Added radials which are handled by python scripts, updated engine, objects now load serverside template at creation

Browse Source
This commit is contained in:
Light2
2013-07-08 23:38:41 +02:00
parent 3afd5eca3a
commit e457b9711c
18 changed files with 828 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+31
View File
@@ -22,6 +22,10 @@
package services.object;
import java.io.Console;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
import java.nio.ByteOrder;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -32,6 +36,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
@@ -40,6 +45,8 @@ import resources.common.*;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
import org.python.core.Py;
import org.python.core.PyObject;
import com.sleepycat.persist.EntityCursor;
@@ -89,6 +96,8 @@ public class ObjectService implements INetworkDispatch {
private Random random = new Random();
private Map<String, PyObject> serverTemplates = new ConcurrentHashMap<String, PyObject>();
public ObjectService(final NGECore core) {
this.core = core;
databaseConnection = core.getDatabase1();
@@ -157,7 +166,28 @@ public class ObjectService implements INetworkDispatch {
return null;
}
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);
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);
}
}
} catch (IOException e) {
e.printStackTrace();
}
//core.scriptService.callScript("scripts/" + serverTemplate.split("shared_" , 2)[0].replace("shared_", ""), "setup", serverTemplate.split("shared_" , 2)[1], core, object);
object.setPlanetId(planet.getID());
objectList.add(object);
@@ -322,6 +352,7 @@ public class ObjectService implements INetworkDispatch {
creature = (CreatureObject) getObject(objectId);
}
creature.setClient(client);
Point3D position = creature.getPosition();
Planet planet = core.terrainService.getPlanetByID(creature.getPlanetId());