From f674c75f1d09076a3706cc6a81c775f5c2c9cbd2 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 29 Aug 2016 22:06:24 +1000
Subject: [PATCH] Fix 1.7 relighting

---
 .../com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java b/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
index a7a53a41..6e52d2e1 100644
--- a/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
+++ b/bukkit1710/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
@@ -378,8 +378,8 @@ public class BukkitQueue17 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkSec
                 }
                 byte[] currentIdArray = (byte[]) fieldIds.get(section);
                 NibbleArray currentDataArray = (NibbleArray) fieldData.get(section);
-                boolean data = currentDataArray != null;
-                if (!data && newDataArray != null) {
+                boolean data = currentDataArray != null && newDataArray != null;
+                if (!data) {
                     section.setDataArray(newDataArray);
                 }
                 if (currentIdArray == null) {
@@ -645,12 +645,12 @@ public class BukkitQueue17 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkSec
 
     @Override
     public int getOpacity(ChunkSection section, int x, int y, int z) {
-        return section.getTypeId(x, y, z).k();
+        return section.getTypeId(x & 15, y & 15, z & 15).k();
     }
 
     @Override
     public int getBrightness(ChunkSection section, int x, int y, int z) {
-        return section.getTypeId(x, y, z).m();
+        return section.getTypeId(x & 15, y & 15, z & 15).m();
     }
 
     @Override
@@ -661,7 +661,7 @@ public class BukkitQueue17 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkSec
 
     @Override
     public int getOpacityBrightnessPair(ChunkSection section, int x, int y, int z) {
-        Block block = section.getTypeId(x, y, z);
+        Block block = section.getTypeId(x & 15, y & 15, z & 15);
         return MathMan.pair16(block.k(), block.m());
     }