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

Fixed bug related to deleting characters

Browse Source 
Also added 2 new variables to destroyObject for certain cases.
This commit is contained in:
Waverunner
2014-03-12 15:01:09 -04:00
parent 0742c19af3
commit 18c0f070fd
3 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/ConnectionService.java
+8 -3
View File
@@ -226,10 +226,13 @@ public class ConnectionService implements INetworkDispatch {
long parentId = object.getParentId();
boolean removed = false;
if(object.getContainer() == null) {
boolean remove = core.simulationService.remove(object, object.getPosition().x, object.getPosition().z);
if(remove)
if(remove) {
System.out.println("Successful quadtree remove");
removed = true;
}
} else {
object.getContainer()._remove(object);
object.setParentId(parentId);
@@ -250,8 +253,10 @@ public class ConnectionService implements INetworkDispatch {
object.createTransaction(core.getCreatureODB().getEnvironment());
core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction());
object.getTransaction().commitSync();
core.objectService.destroyObject(object);
if(removed)
core.objectService.destroyObject(object, false);
else
core.objectService.destroyObject(object);
}