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

Added getObjectByFirstName null checks

Browse Source
This commit is contained in:
Treeku
2014-05-02 21:12:45 +01:00
parent f7fc2dbb2e
commit 5e522cf03b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+7 -7
View File
@@ -548,9 +548,7 @@ public class ObjectService implements INetworkDispatch {
}
public SWGObject getObjectByFirstName(String customName) {
synchronized(objectList) {
for(SWGObject obj : objectList.values()) {
if(obj.getCustomName() == null)
continue;
@@ -562,13 +560,15 @@ public class ObjectService implements INetworkDispatch {
ODBCursor cursor = core.getSWGObjectODB().getCursor();
while(cursor.hasNext()) {
if(((SWGObject) cursor.next()).getCustomName().startsWith(customName))
return (SWGObject) cursor.next();
while (cursor.hasNext()) {
SWGObject object = (SWGObject) cursor.next();
if (object != null && object.getCustomName() != null && customName.length() > 0 && object.getCustomName().startsWith(customName)) {
return object;
}
}
return null;
}
public CreatureObject getCreatureFromDB(long objectId) {