projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-19 09:03:02 -04:00
Code Issues Projects Releases Wiki Activity

Fixed a weird issue with object IDs generated overlapping others

Browse Source
This commit is contained in:
Obique PSWG
2016-05-30 09:21:23 -05:00
parent 576b2bd8be
commit 83d4ae2098
3 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectCreator.java
+12 -14
View File
@@ -61,12 +61,18 @@ import resources.server_info.Log;
public final class ObjectCreator {
private static final Object OBJECT_ID_MUTEX = new Object();
private static long maxObjectId = 1;
private static long nextObjectId = 1;
public static void updateMaxObjectId(long objectId) {
private static void updateMaxObjectId(long objectId) {
synchronized (OBJECT_ID_MUTEX) {
if (objectId > maxObjectId)
maxObjectId = objectId;
if (objectId >= nextObjectId)
nextObjectId = objectId+1;
}
}
private static long getNextObjectId() {
synchronized (OBJECT_ID_MUTEX) {
return nextObjectId++;
}
}
@@ -108,19 +114,11 @@ public final class ObjectCreator {
}
public static SWGObject createObjectFromTemplate(String template) {
long id = 0;
synchronized (OBJECT_ID_MUTEX) {
id = maxObjectId++;
}
return createObjectFromTemplate(id, template);
return createObjectFromTemplate(getNextObjectId(), template);
}
public static <T extends SWGObject> T createObjectFromTemplate(String template, Class <T> c) {
long id = 0;
synchronized (OBJECT_ID_MUTEX) {
id = maxObjectId++;
}
return createObjectFromTemplate(id, template, c);
return createObjectFromTemplate(getNextObjectId(), template, c);
}
private static SWGObject createObjectFromType(long objectId, String template, GameObjectType got) {