From 28ccc21d10989ca030bc49f2ca06fda26559595f Mon Sep 17 00:00:00 2001 From: Treeku Date: Sat, 17 May 2014 22:01:33 +0100 Subject: [PATCH] Fixed some nulls that can occur locally --- src/main/NGECore.java | 4 +++- src/services/SimulationService.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/NGECore.java b/src/main/NGECore.java index 44cab1a0..1da3308a 100644 --- a/src/main/NGECore.java +++ b/src/main/NGECore.java @@ -524,7 +524,9 @@ public class NGECore { List deletedObjects = new ArrayList(); 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); } diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java index 432868e4..170a30ba 100644 --- a/src/services/SimulationService.java +++ b/src/services/SimulationService.java @@ -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)