From 20e878158884c86e1153e95d876105560b8fd17d Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Mon, 14 Oct 2019 02:11:56 -0700 Subject: [PATCH] add schematic showfake option, fixes #1992 --- .../denizen/objects/ChunkTag.java | 6 ++-- .../commands/BukkitCommandRegistry.java | 2 +- .../commands/world/SchematicCommand.java | 36 +++++++++++++++---- .../denizen/utilities/blocks/BlockSet.java | 7 ++++ .../utilities/blocks/CuboidBlockSet.java | 9 ++++- .../denizen/utilities/blocks/FakeBlock.java | 20 +++++------ 6 files changed, 59 insertions(+), 21 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java index d5fd15d755..3735d432f4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java @@ -697,9 +697,9 @@ public void adjust(Mechanism mechanism) { new BukkitRunnable() { @Override public void run() { - for (Map blocks : FakeBlock.getBlocks().values()) { - for (Map.Entry locBlock : blocks.entrySet()) { - LocationTag location = locBlock.getKey(); + for (Map blocks : FakeBlock.getBlocks().values()) { + for (Map.Entry locBlock : blocks.entrySet()) { + Location location = locBlock.getKey(); if (Math.floor(location.getX() / 16) == chunkX && Math.floor(location.getZ() / 16) == chunkZ) { locBlock.getValue().updateBlock(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/BukkitCommandRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/BukkitCommandRegistry.java index ea39fe1c18..6ad33161a1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/BukkitCommandRegistry.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/BukkitCommandRegistry.java @@ -178,7 +178,7 @@ public void registerCommands() { } registerCoreMember(ResetCommand.class, "RESET", "reset (|...) [cooldown/saves/global_cooldown] (