From 5caeed19a1fc7856150322ba1e1801811d047914 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 24 Jul 2017 13:16:03 +1000
Subject: [PATCH] Fix pasting nbt on the same block with combine-stages
 disabled

---
 .../java/com/boydti/fawe/object/HistoryExtent.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java b/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
index e163f596..f908cb55 100644
--- a/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
+++ b/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
@@ -63,11 +63,14 @@ public class HistoryExtent extends AbstractDelegateExtent {
         int id = (combined >> 4);
         if (id == block.getId()) {
             if (!FaweCache.hasData(id)) {
-                return false;
-            }
-            int data = combined & 0xF;
-            if (data == block.getData()) {
-                return false;
+                if (!block.hasNbtData()) {
+                    return false;
+                }
+            } else if (!block.hasNbtData()) {
+                int data = combined & 0xF;
+                if (data == block.getData()) {
+                    return false;
+                }
             }
         }
         try {