From 05ee0e4c6608d51f8fe34649f5a91b353f7388fa Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Mon, 22 Jun 2015 22:02:46 +0200
Subject: [PATCH] Fixed issue #28

---
 .../rev317/min/api/methods/SceneObjects.java  | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/org/rev317/min/api/methods/SceneObjects.java b/src/org/rev317/min/api/methods/SceneObjects.java
index 8a986d9..c361df1 100644
--- a/src/org/rev317/min/api/methods/SceneObjects.java
+++ b/src/org/rev317/min/api/methods/SceneObjects.java
@@ -178,47 +178,49 @@ public class SceneObjects {
     public static final Collection<SceneObject> getSceneObjectsAtTile(int x, int y, boolean useCached) {
         Ground sceneTile = Loader.getClient().getScene().getGroundArray()[Game.getPlane()][x][y];
         ArrayList<SceneObject> sceneObjects = null;
-        final SceneObjectTile[] interactiveObjects = sceneTile.getInteractiveObjects();
-        if (interactiveObjects != null) {
-            for (final SceneObjectTile interactiveObject : interactiveObjects) {
-                if (interactiveObject != null) {
-                    if (sceneObjects == null) {
-                        sceneObjects = new ArrayList<>();
+        if (sceneTile != null) {
+            final SceneObjectTile[] interactiveObjects = sceneTile.getInteractiveObjects();
+            if (interactiveObjects != null) {
+                for (final SceneObjectTile interactiveObject : interactiveObjects) {
+                    if (interactiveObject != null) {
+                        if (sceneObjects == null) {
+                            sceneObjects = new ArrayList<>();
+                        }
+                        sceneObjects.add(new SceneObject(interactiveObject, SceneObject.TYPE_INTERACTIVE));
                     }
-                    sceneObjects.add(new SceneObject(interactiveObject, SceneObject.TYPE_INTERACTIVE));
                 }
             }
-        }
-        SceneObjectTile sceneObjectTile = sceneTile.getWallObject();
-        if (sceneObjectTile != null) {
-            if (sceneObjects == null) {
-                sceneObjects = new ArrayList<>();
+            SceneObjectTile sceneObjectTile = sceneTile.getWallObject();
+            if (sceneObjectTile != null) {
+                if (sceneObjects == null) {
+                    sceneObjects = new ArrayList<>();
+                }
+                sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALL));
             }
-            sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALL));
-        }
 
-        sceneObjectTile = sceneTile.getWallDecoration();
-        if (sceneObjectTile != null) {
-            if (sceneObjects == null) {
-                sceneObjects = new ArrayList<>();
+            sceneObjectTile = sceneTile.getWallDecoration();
+            if (sceneObjectTile != null) {
+                if (sceneObjects == null) {
+                    sceneObjects = new ArrayList<>();
+                }
+                sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALLDECORATION));
             }
-            sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALLDECORATION));
-        }
 
-        sceneObjectTile = sceneTile.getGroundDecoration();
-        if (sceneObjectTile != null) {
-            if (sceneObjects == null) {
-                sceneObjects = new ArrayList<>();
+            sceneObjectTile = sceneTile.getGroundDecoration();
+            if (sceneObjectTile != null) {
+                if (sceneObjects == null) {
+                    sceneObjects = new ArrayList<>();
+                }
+                sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDDECORATION));
             }
-            sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDDECORATION));
-        }
 
-        sceneObjectTile = sceneTile.getGroundItem();
-        if (sceneObjectTile != null) {
-            if (sceneObjects == null) {
-                sceneObjects = new ArrayList<>();
+            sceneObjectTile = sceneTile.getGroundItem();
+            if (sceneObjectTile != null) {
+                if (sceneObjects == null) {
+                    sceneObjects = new ArrayList<>();
+                }
+                sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDITEM));
             }
-            sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDITEM));
         }
         return sceneObjects;
     }