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

master merge

Browse Source
This commit is contained in:
CharonInferar
2014-07-14 15:32:28 +02:00
parent becca491b4
commit cc28f80394
80 changed files with 1132 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+10 -3
View File
@@ -138,7 +138,8 @@ import services.sui.SUIWindow.Trigger;
@SuppressWarnings("unused")
public class ObjectService implements INetworkDispatch {
private Map<Long, SWGObject> objectList = new ConcurrentHashMap<Long, SWGObject>();
//private Map<Long, SWGObject> objectList = new ConcurrentHashMap<Long, SWGObject>();
private Map<Long, SWGObject> objectList = new ObjectList<Long, SWGObject>();
private NGECore core;
private DatabaseConnection databaseConnection;
private AtomicLong highestId = new AtomicLong();
@@ -264,7 +265,7 @@ public class ObjectService implements INetworkDispatch {
e.printStackTrace();
}
planet = core.terrainService.getPlanetByID(0);
planet = core.terrainService.getPlanetByID(1);
}
if(Template.startsWith("object/creature")) {
@@ -433,7 +434,13 @@ public class ObjectService implements INetworkDispatch {
loadServerTemplateTasks.add(() -> loadServerTemplate(pointer));
}
objectList.put(objectID, object);
SWGObject ret = objectList.put(objectID, object);
//if (ret != null && !ret.getTemplate().equals(object.getTemplate())) {
if (ret == null) {
//System.err.println("ObjectService: Detected duplicate Id. Assigning new one.")
object = createObject(Template, objectID, planet, position, orientation, customServerTemplate, overrideSnapshot, loadServerTemplate);
}
return object;
}