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

Fixed some nulls that can occur locally

Browse Source
This commit is contained in:
Treeku
2014-05-17 22:01:33 +01:00
parent 424cc8fe23
commit 28ccc21d10
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+3 -1
View File
@@ -524,7 +524,9 @@ public class NGECore {
List<CreatureObject> deletedObjects = new ArrayList<CreatureObject>();
while(cursor.hasNext()) {
SWGObject creature = (SWGObject) cursor.next();
Object next = cursor.next();
if (next == null) continue;
SWGObject creature = (SWGObject) next;
if(!characterService.playerExists(creature.getObjectID()) && creature instanceof CreatureObject)
deletedObjects.add((CreatureObject) creature);
}
src/services/SimulationService.java
+3 -1
View File
@@ -193,7 +193,9 @@ public class SimulationService implements INetworkDispatch {
ODBCursor cursor = core.getSWGObjectODB().getCursor();
while(cursor.hasNext()) {
SWGObject building = core.objectService.getObject(((SWGObject) cursor.next()).getObjectID());
Object next = cursor.next();
if (next == null) continue;
SWGObject building = core.objectService.getObject(((SWGObject) next).getObjectID());
if(building == null || (!(building instanceof BuildingObject) && !(building instanceof HarvesterObject)))
continue;
if(building.getAttachment("hasLoadedServerTemplate") == null)