workaround banners being weird to showfake banners properly

DenizenScript · Jun 12, 2020 · 6e47011 · 6e47011
1 parent 358b859
commit 6e47011
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/util/jnbt/CompoundTagBuilder.java b/plugin/src/main/java/com/denizenscript/denizen/nms/util/jnbt/CompoundTagBuilder.java
@@ -34,7 +34,7 @@ public class CompoundTagBuilder {
     /**
      * Create a new instance.
      */
-    CompoundTagBuilder() {
+    public CompoundTagBuilder() {
         this.entries = new HashMap<>();
     }
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/FakeBlock.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/FakeBlock.java
@@ -136,6 +136,9 @@ private void updateBlock(MaterialTag material, DurationTag duration) {
         }
         if (material.hasModernData()) {
             material.getModernData().sendFakeChangeTo(player.getPlayerEntity(), location);
+            if (material.getMaterial().name().endsWith("_BANNER")) { // Banners are weird
+                location.getWorld().refreshChunk(chunkCoord.x, chunkCoord.z);
+            }
         }
         else {
             player.getPlayerEntity().sendBlockChange(location, material.getMaterial(), material.getMaterialData().getData());

diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/BlockHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/BlockHelperImpl.java
@@ -122,6 +122,9 @@ public CompoundTag getNbtData(Block block) {
         NMSHandler.getChunkHelper().changeChunkServerThread(block.getWorld());
         org.bukkit.block.BlockState state = block.getState();
         NMSHandler.getChunkHelper().restoreServerThread(block.getWorld());
+        if (!(state instanceof CraftBlockEntityState)) {
+            return null;
+        }
         TileEntity tileEntity = getTE((CraftBlockEntityState) state);
         if (tileEntity == null) {
             return null;