From 755103a5588bda342dabbc8df9344dcb78eb5aa6 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 7 Aug 2017 23:27:31 +1000
Subject: [PATCH] Fix block meta issues 1.7.10 bukkit

Fixes #655
Closes #679 (duplicate)
---
 .../fawe/bukkit/v1_7/BukkitChunk_1_7.java     | 95 ++++++++++---------
 .../fawe/bukkit/v1_7/BukkitQueue17.java       |  3 +
 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
index 761eecdd..da558bdc 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
@@ -334,7 +334,7 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
                 NibbleArray currentDataArray = (NibbleArray) BukkitQueue17.fieldData.get(section);
                 boolean data = currentDataArray != null && newDataArray != null;
                 if (currentDataArray == null) {
-                    byte compactData = (byte) section.getData(0, 0, 0);
+                    int compactData = ((byte) BukkitQueue17.fieldCompactData.get(section)) & 0xFF;
                     if (compactData != 0 && newDataArray == null) {
                         newDataArray = new NibbleArray(new byte[2048], 4);
                         byte full = (byte) ((compactData << 4) + compactData);
@@ -358,13 +358,13 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
                                 int i2 = i << 1;
                                 int i3 = i2 + 1;
                                 byte val = newDataArray.a[i];
-                                if (charArray[i3] != 0) {
-                                    if (charArray[i2] != 0) continue;
+                                if (newIdArray[i3] != 0) {
+                                    if (newIdArray[i2] != 0) continue;
                                     newDataArray.a[i] = (byte) (val & 240 | compactData);
                                     continue;
                                 }
-                                if (charArray[i2] != 0) {
-                                    if (charArray[i3] != 0) continue;
+                                if (newIdArray[i2] != 0) {
+                                    if (newIdArray[i3] != 0) continue;
                                     newDataArray.a[i] = (byte) (val & 15 | (compactData) << 4);
                                     continue;
                                 }
@@ -374,53 +374,54 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
                         section.setDataArray(null);
                         section.setDataArray(newDataArray);
                     }
-                }
-                if (currentIdArray == null && newIdArray != null) {
-                    int id = (int) BukkitQueue17.fieldCompactId.get(section);
-                    if (id == 0) {
-                        section.setIdArray(null);
-                        section.setIdArray(newIdArray);
-                        getParent().setCount(0, count - this.getAir(j), section);
-                        continue;
-                    } else {
-                        currentIdArray = section.getIdArray();
-                    }
-                }
-                int nonEmptyBlockCount = 0;
-                for (int k = 0; k < newIdArray.length; k++) {
-                    char combined = charArray[k];
-                    switch (combined) {
-                        case 0:
-                            continue;
-                        case 1: {
-                            byte existing = currentIdArray[k];
-                            if (existing != 0) {
-                                currentIdArray[k] = 0;
-                                nonEmptyBlockCount--;
-                            }
+                } else if (newDataArray == null) {
+                    for (int i = 0; i < currentDataArray.a.length; i++) {
+                        int i2 = i << 1;
+                        int i3 = i2 + 1;
+                        byte val = currentDataArray.a[i];
+                        if (newIdArray[i3] == 0) {
+                            if (newIdArray[i2] != 0) currentDataArray.a[i] = (byte) (val & 240);
                             continue;
                         }
-                        default:
-                            byte existing = currentIdArray[k];
-                            if (existing != 0) {
-                                // TODO unlight
-                            } else {
-                                nonEmptyBlockCount++;
-                            }
-                            currentIdArray[k] = newIdArray[k];
-                            if (data) {
-                                int dataByte = FaweCache.getData(combined);
-                                int kShift = k >> 1;
-                                if ((k & 1) == 0) {
-                                    currentDataArray.a[kShift] = (byte) (currentDataArray.a[kShift] & 240 | dataByte);
-                                } else {
-                                    currentDataArray.a[kShift] = (byte) (currentDataArray.a[kShift] & 15 | (dataByte) << 4);
-                                }
-                            }
+                        if (newIdArray[i2] == 0) {
+                            if (newIdArray[i3] != 0) currentDataArray.a[i] = (byte) (val & 15);
                             continue;
+                        }
+                        currentDataArray.a[i] = 0;
                     }
                 }
-                getParent().setCount(0, getParent().getNonEmptyBlockCount(section) + nonEmptyBlockCount, section);
+                int solid = 0;
+                if (currentIdArray == null) {
+                    byte id = (byte) ((int) BukkitQueue17.fieldCompactId.get(section));
+                    if (id != 0) {
+                        solid = 4096;
+                        for (int i = 0; i < 4096; i++) {
+                            if (charArray[i] == 0) newIdArray[i] = id;
+                            else if (newIdArray[i] == 0) solid--;
+                        }
+                    } else {
+                        for (int i = 0; i < 4096; i++) if (newIdArray[i] != 0) solid++;
+                    }
+                    section.setIdArray(null);
+                    section.setIdArray(newIdArray);
+                } else {
+                    for (int i = 0; i < 4096; i++) {
+                        if (charArray[i] != 0) currentIdArray[i] = newIdArray[i];
+                    }
+                    for (int i = 0; i < 4096; i++) if (currentIdArray[i] != 0) solid++;
+                }
+                if (data) {
+                    for (int k = 0; k < 4096; k++) {
+                        int dataByte = FaweCache.getData(charArray[k]);
+                        int kShift = k >> 1;
+                        if ((k & 1) == 0) {
+                            currentDataArray.a[kShift] = (byte) (currentDataArray.a[kShift] & 240 | dataByte);
+                        } else {
+                            currentDataArray.a[kShift] = (byte) (currentDataArray.a[kShift] & 15 | (dataByte) << 4);
+                        }
+                    }
+                }
+                getParent().setCount(0, solid, section);
             }
 
             // Set biomes
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 269b28cc..1c2ee30c 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
@@ -70,6 +70,7 @@ public class BukkitQueue17 extends BukkitQueue_0<net.minecraft.server.v1_7_R4.Ch
     protected static Field fieldData;
     protected static Field fieldIds;
     protected static Field fieldCompactId;
+    protected static Field fieldCompactData;
     protected static Field fieldTickingBlockCount;
     protected static Field fieldNonEmptyBlockCount;
     protected static Field fieldBiomes;
@@ -91,6 +92,8 @@ public class BukkitQueue17 extends BukkitQueue_0<net.minecraft.server.v1_7_R4.Ch
             fieldIds.setAccessible(true);
             fieldCompactId = ChunkSection.class.getDeclaredField("compactId");
             fieldCompactId.setAccessible(true);
+            fieldCompactData = ChunkSection.class.getDeclaredField("compactData");
+            fieldCompactData.setAccessible(true);
             fieldTickingBlockCount = ChunkSection.class.getDeclaredField("tickingBlockCount");
             fieldNonEmptyBlockCount = ChunkSection.class.getDeclaredField("nonEmptyBlockCount");
             fieldTickingBlockCount.setAccessible(true);