Fixed issue #28

This commit is contained in:
JKetelaar
2015-06-22 22:02:46 +02:00
parent 62eb225a00
commit 05ee0e4c66
@@ -178,47 +178,49 @@ public class SceneObjects {
public static final Collection<SceneObject> getSceneObjectsAtTile(int x, int y, boolean useCached) { public static final Collection<SceneObject> getSceneObjectsAtTile(int x, int y, boolean useCached) {
Ground sceneTile = Loader.getClient().getScene().getGroundArray()[Game.getPlane()][x][y]; Ground sceneTile = Loader.getClient().getScene().getGroundArray()[Game.getPlane()][x][y];
ArrayList<SceneObject> sceneObjects = null; ArrayList<SceneObject> sceneObjects = null;
final SceneObjectTile[] interactiveObjects = sceneTile.getInteractiveObjects(); if (sceneTile != null) {
if (interactiveObjects != null) { final SceneObjectTile[] interactiveObjects = sceneTile.getInteractiveObjects();
for (final SceneObjectTile interactiveObject : interactiveObjects) { if (interactiveObjects != null) {
if (interactiveObject != null) { for (final SceneObjectTile interactiveObject : interactiveObjects) {
if (sceneObjects == null) { if (interactiveObject != null) {
sceneObjects = new ArrayList<>(); 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();
SceneObjectTile sceneObjectTile = sceneTile.getWallObject(); if (sceneObjectTile != null) {
if (sceneObjectTile != null) { if (sceneObjects == null) {
if (sceneObjects == null) { sceneObjects = new ArrayList<>();
sceneObjects = new ArrayList<>(); }
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALL));
} }
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALL));
}
sceneObjectTile = sceneTile.getWallDecoration(); sceneObjectTile = sceneTile.getWallDecoration();
if (sceneObjectTile != null) { if (sceneObjectTile != null) {
if (sceneObjects == null) { if (sceneObjects == null) {
sceneObjects = new ArrayList<>(); sceneObjects = new ArrayList<>();
}
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALLDECORATION));
} }
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_WALLDECORATION));
}
sceneObjectTile = sceneTile.getGroundDecoration(); sceneObjectTile = sceneTile.getGroundDecoration();
if (sceneObjectTile != null) { if (sceneObjectTile != null) {
if (sceneObjects == null) { if (sceneObjects == null) {
sceneObjects = new ArrayList<>(); sceneObjects = new ArrayList<>();
}
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDDECORATION));
} }
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDDECORATION));
}
sceneObjectTile = sceneTile.getGroundItem(); sceneObjectTile = sceneTile.getGroundItem();
if (sceneObjectTile != null) { if (sceneObjectTile != null) {
if (sceneObjects == null) { if (sceneObjects == null) {
sceneObjects = new ArrayList<>(); sceneObjects = new ArrayList<>();
}
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDITEM));
} }
sceneObjects.add(new SceneObject(sceneObjectTile, SceneObject.TYPE_GROUNDITEM));
} }
return sceneObjects; return sceneObjects;
} }