From a844f2709386d01c3289c669678d91a4f428025e Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sun, 18 Apr 2021 17:28:27 -0700
Subject: [PATCH] Fix mistakes

---
 .../com/gmail/nossr50/util/BlockUtils.java    |  2 +-
 .../util/blockmeta/ChunkStoreTest.java        | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java
index 135025952..984ccbdaf 100644
--- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java
@@ -293,7 +293,7 @@ public final class BlockUtils {
         World world = block.getWorld();
 
         //pretty sure both height and min height are able to have blocks placed on them
-        return block.getY() >= worldCompatibilityLayer.getMinWorldHeight(world) && block.getY() <= worldCompatibilityLayer.getMaxWorldHeight(world);
+        return block.getY() >= worldCompatibilityLayer.getMinWorldHeight(world) && block.getY() < worldCompatibilityLayer.getMaxWorldHeight(world);
     }
 
 }
diff --git a/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java b/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
index b8e93d9cc..8876c99d6 100644
--- a/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
+++ b/src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
@@ -40,6 +40,8 @@ import static org.mockito.Mockito.mock;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ Bukkit.class, mcMMO.class})
 public class ChunkStoreTest {
+    public static final int LEGACY_WORLD_HEIGHT_MAX = 256;
+    public static final int LEGACY_WORLD_HEIGHT_MIN = 0;
     private static File tempDir;
     @BeforeClass
     public static void setUpClass() {
@@ -77,8 +79,20 @@ public class ChunkStoreTest {
         Mockito.when(platformManager.getCompatibilityManager()).thenReturn(compatibilityManager);
         Mockito.when(platformManager.getCompatibilityManager().getWorldCompatibilityLayer()).thenReturn(worldCompatibilityLayer);
         Assert.assertNotNull(mcMMO.getCompatibilityManager().getWorldCompatibilityLayer());
-        Mockito.when(worldCompatibilityLayer.getMinWorldHeight(mockWorld)).thenReturn(0);
-        Mockito.when(worldCompatibilityLayer.getMaxWorldHeight(mockWorld)).thenReturn(255);
+        Mockito.when(worldCompatibilityLayer.getMinWorldHeight(mockWorld)).thenReturn(LEGACY_WORLD_HEIGHT_MIN);
+        Mockito.when(worldCompatibilityLayer.getMaxWorldHeight(mockWorld)).thenReturn(LEGACY_WORLD_HEIGHT_MAX);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testIndexOutOfBounds() {
+        Mockito.when(mcMMO.getCompatibilityManager().getWorldCompatibilityLayer().getMinWorldHeight(mockWorld)).thenReturn(-64);
+        HashChunkManager hashChunkManager = new HashChunkManager();
+
+
+        //Top Block
+        TestBlock illegalHeightBlock = new TestBlock(1337, 256, -1337, mockWorld);
+        Assert.assertFalse(hashChunkManager.isTrue(illegalHeightBlock));
+        hashChunkManager.setTrue(illegalHeightBlock);
     }
 
     @Test
@@ -108,7 +122,7 @@ public class ChunkStoreTest {
         Assert.assertTrue(hashChunkManager.isTrue(bottomBlock));
 
         //Top Block
-        TestBlock topBlock = new TestBlock(1337, 256, -1337, mockWorld);
+        TestBlock topBlock = new TestBlock(1337, 255, -1337, mockWorld);
         Assert.assertFalse(hashChunkManager.isTrue(topBlock));
 
         Assert.assertTrue(BlockUtils.isWithinWorldBounds(worldCompatibilityLayer, topBlock));