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

Reverted Changes

Browse Source 
Light's already fixed this
This commit is contained in:
Waverunner
2014-03-12 15:19:27 -04:00
parent a19e18bb34
commit afb5c58447
3 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+5 -18
View File
@@ -357,22 +357,18 @@ public class ObjectService implements INetworkDispatch {
public Map<Long, SWGObject> getObjectList() { return objectList; }
public void destroyObject(SWGObject object) {
destroyObject(object, false, true);
}
public void destroyObject(final SWGObject object, int seconds) {
scheduler.schedule(new Runnable() {
@Override
public void run() {
destroyObject(object, false, true);
destroyObject(object);
}
}, seconds, TimeUnit.SECONDS);
}
public void destroyObject(SWGObject object, boolean notify, boolean removeFromQt) {
public void destroyObject(SWGObject object) {
if (object == null) {
return;
}
@@ -415,29 +411,20 @@ public class ObjectService implements INetworkDispatch {
objectList.remove(obj.getObjectID());
}
});
if(removeFromQt && !notify)
core.simulationService.remove(object, object.getPosition().x, object.getPosition().y);
else if(notify && removeFromQt)
core.simulationService.remove(object, object.getPosition().x, object.getPosition().y, true);
objectList.remove(object.getObjectID());
core.simulationService.remove(object, object.getPosition().x, object.getPosition().y);
}
public void destroyObject(long objectID) {
SWGObject object = getObject(objectID);
if(object != null) {
destroyObject(object, false, true);
destroyObject(object);
}
}
public void destroyObject(SWGObject object, boolean removeFromQt) {
destroyObject(object, false, removeFromQt);
}
public SWGObject getObjectByCustomName(String customName) {
synchronized(objectList) {