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

Merge remote-tracking branch 'origin/master' into DynamicWorldSpawnUpdate

Browse Source
This commit is contained in:
CharonInferar
2014-05-02 22:32:58 +02:00
parent b33062c67a 57dcb72718
commit 9c8220bb0c
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+14 -5
View File
@@ -524,6 +524,9 @@ public class ObjectService implements INetworkDispatch {
}
public SWGObject getObjectByCustomName(String customName) {
if (customName == null) {
return null;
}
synchronized(objectList) {
@@ -538,16 +541,22 @@ public class ObjectService implements INetworkDispatch {
ODBCursor cursor = core.getSWGObjectODB().getCursor();
while(cursor.hasNext()) {
if(((SWGObject) cursor.next()).getCustomName().equals(customName))
return (SWGObject) cursor.next();
while (cursor.hasNext()) {
SWGObject object = (SWGObject) cursor.next();
if (object != null && object.getCustomName() != null && customName.length() > 0 && object.getCustomName().equals(customName)) {
return object;
}
}
return null;
}
public SWGObject getObjectByFirstName(String customName) {
if (customName == null) {
return null;
}
synchronized(objectList) {
for(SWGObject obj : objectList.values()) {
if(obj.getCustomName() == null)