From bd6eb2b7b875d4c53ab20577c063287652d046bd Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 10 Apr 2017 22:40:49 +1000
Subject: [PATCH] Fix 1.7 get id

---
 .../main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java    | 2 +-
 .../main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
index 9cc1bb74..54abfbfd 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
@@ -234,7 +234,7 @@ public class BukkitQueue17 extends BukkitQueue_0<net.minecraft.server.v1_7_R4.Ch
         byte[] ids = ls.getIdArray();
         NibbleArray datasNibble = ls.getDataArray();
         int i = FaweCache.CACHE_J[y & 15][z & 15][x & 15];
-        int combined = (ids[i] << 4) + (datasNibble == null ? 0 : datasNibble.a(x & 15, y & 15, z & 15));
+        int combined = ((ids[i] & 0xFF)  << 4) + (datasNibble == null ? 0 : datasNibble.a(x & 15, y & 15, z & 15));
         return combined;
     }
 
diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
index ea3a0ccb..e29e5e81 100644
--- a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
+++ b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
@@ -163,7 +163,7 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         byte[] ids = ls.getBlockLSBArray();
         NibbleArray datasNibble = ls.getBlockMSBArray();
         int i = FaweCache.CACHE_J[y & 15][z & 15][x & 15];
-        int combined = (ids[i] << 4) + (datasNibble == null ? 0 : datasNibble.get(x & 15, y & 15, z & 15));
+        int combined = ((ids[i] & 0xFF) << 4) + (datasNibble == null ? 0 : datasNibble.get(x & 15, y & 15, z & 15));
         return combined;
     }