Avoid trap in Spigot for light levels outside max height

fengxxx · Dec 15, 2014 · 274a363 · 274a363
1 parent b0d9f55
commit 274a363
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/org/dynmap/bukkit/BukkitWorld.java b/src/main/java/org/dynmap/bukkit/BukkitWorld.java
@@ -11,6 +11,7 @@
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.dynmap.DynmapChunk;
@@ -124,7 +125,10 @@ public boolean isLoaded() {
     @Override
     public int getLightLevel(int x, int y, int z) {
         if(world != null) {
-            return world.getBlockAt(x, y, z).getLightLevel();
+            if ((y >= 0) && (y < this.worldheight)) {
+                return world.getBlockAt(x, y, z).getLightLevel();
+            }
+            return 0;
         }
         else {
             return -1;
@@ -149,7 +153,12 @@ public boolean canGetSkyLightLevel() {
     @Override
     public int getSkyLightLevel(int x, int y, int z) {
         if(world != null) {
-            return world.getBlockAt(x, y, z).getLightFromSky();
+            if ((y >= 0) && (y < this.worldheight)) {
+                return world.getBlockAt(x, y, z).getLightFromSky();
+            }
+            else {
+                return 15;
+            }
         }
         else {
             return -1;