|
@@ -123,30 +123,18 @@ public final class L2World
|
|
{
|
|
{
|
|
if (_allObjects.containsKey(object.getObjectId()))
|
|
if (_allObjects.containsKey(object.getObjectId()))
|
|
{
|
|
{
|
|
- if (Config.DEBUG)
|
|
|
|
- {
|
|
|
|
- _log.log(Level.WARNING, "--------[L2World] object: " + object + " already exist in OID map!--------");
|
|
|
|
- _log.log(Level.WARNING, "New object: " + StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
|
|
|
|
- _log.log(Level.WARNING, "----------------- Previous Put -----------------");
|
|
|
|
- _log.log(Level.WARNING, "Previous: " + _allObjectsDebug.get(object.getObjectId()));
|
|
|
|
- _log.log(Level.WARNING, "---------------------- End ---------------------");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ _log.log(Level.WARNING, "--------[L2World] object: " + object + " already exist in OID map!--------");
|
|
|
|
+ _log.log(Level.WARNING, "New object: " + StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
|
|
|
|
+ _log.log(Level.WARNING, "----------------- Previous Put -----------------");
|
|
|
|
+ _log.log(Level.WARNING, "Previous: " + _allObjectsDebug.get(object.getObjectId()));
|
|
|
|
+ _log.log(Level.WARNING, "---------------------- End ---------------------");
|
|
|
|
+ return;
|
|
}
|
|
}
|
|
|
|
|
|
_allObjects.put(object.getObjectId(), object);
|
|
_allObjects.put(object.getObjectId(), object);
|
|
_allObjectsDebug.put(object.getObjectId(), StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
|
|
_allObjectsDebug.put(object.getObjectId(), StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
|
|
}
|
|
}
|
|
|
|
|
|
- public long timeStoreObject(L2Object object)
|
|
|
|
- {
|
|
|
|
- long time = System.nanoTime();
|
|
|
|
- _allObjects.put(object.getObjectId(), object);
|
|
|
|
- _allObjectsDebug.put(object.getObjectId(), StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
|
|
|
|
- time = System.nanoTime() - time;
|
|
|
|
- return time;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* Remove L2Object object from _allObjects of L2World.<BR><BR>
|
|
* Remove L2Object object from _allObjects of L2World.<BR><BR>
|
|
*
|
|
*
|
|
@@ -161,7 +149,7 @@ public final class L2World
|
|
public void removeObject(L2Object object)
|
|
public void removeObject(L2Object object)
|
|
{
|
|
{
|
|
_allObjects.remove(object.getObjectId()); // suggestion by whatev
|
|
_allObjects.remove(object.getObjectId()); // suggestion by whatev
|
|
- //IdFactory.getInstance().releaseId(object.getObjectId());
|
|
|
|
|
|
+ _allObjectsDebug.remove(object.getObjectId());
|
|
}
|
|
}
|
|
|
|
|
|
public void removeObjects(List<L2Object> list)
|
|
public void removeObjects(List<L2Object> list)
|
|
@@ -169,24 +157,20 @@ public final class L2World
|
|
for (L2Object o : list)
|
|
for (L2Object o : list)
|
|
{
|
|
{
|
|
if (o != null)
|
|
if (o != null)
|
|
|
|
+ {
|
|
_allObjects.remove(o.getObjectId()); // suggestion by whatev
|
|
_allObjects.remove(o.getObjectId()); // suggestion by whatev
|
|
|
|
+ _allObjectsDebug.remove(o.getObjectId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- //IdFactory.getInstance().releaseId(object.getObjectId());
|
|
|
|
}
|
|
}
|
|
|
|
|
|
public void removeObjects(L2Object[] objects)
|
|
public void removeObjects(L2Object[] objects)
|
|
{
|
|
{
|
|
for (L2Object o : objects)
|
|
for (L2Object o : objects)
|
|
|
|
+ {
|
|
_allObjects.remove(o.getObjectId()); // suggestion by whatev
|
|
_allObjects.remove(o.getObjectId()); // suggestion by whatev
|
|
- //IdFactory.getInstance().releaseId(object.getObjectId());
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public long timeRemoveObject(L2Object object)
|
|
|
|
- {
|
|
|
|
- long time = System.nanoTime();
|
|
|
|
- _allObjects.remove(object.getObjectId());
|
|
|
|
- time = System.nanoTime() - time;
|
|
|
|
- return time;
|
|
|
|
|
|
+ _allObjectsDebug.remove(o.getObjectId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -201,14 +185,6 @@ public final class L2World
|
|
return _allObjects.get(oID);
|
|
return _allObjects.get(oID);
|
|
}
|
|
}
|
|
|
|
|
|
- public long timeFindObject(int objectID)
|
|
|
|
- {
|
|
|
|
- long time = System.nanoTime();
|
|
|
|
- _allObjects.get(objectID);
|
|
|
|
- time = System.nanoTime() - time;
|
|
|
|
- return time;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* Added by Tempy - 08 Aug 05
|
|
* Added by Tempy - 08 Aug 05
|
|
* @return retrieval of all visible objects in world.
|
|
* @return retrieval of all visible objects in world.
|