From 31a9c4561ceb89b4b92636b4184edb10d0616ec2 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 6 Oct 2017 17:49:17 +1100 Subject: [PATCH] Fix LPCommandMode --- .../boydti/fawe/object/clipboard/ClipboardRemapper.java | 5 ++--- .../fawe/nukkit/core/converter/MCAFile2LevelDB.java | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/boydti/fawe/object/clipboard/ClipboardRemapper.java b/core/src/main/java/com/boydti/fawe/object/clipboard/ClipboardRemapper.java index db4e9133..bdd09cb3 100644 --- a/core/src/main/java/com/boydti/fawe/object/clipboard/ClipboardRemapper.java +++ b/core/src/main/java/com/boydti/fawe/object/clipboard/ClipboardRemapper.java @@ -346,10 +346,9 @@ public class ClipboardRemapper { for (int data = 4; data < 12; data++) mapPEtoPC.put(new BaseBlock(id, data), new BaseBlock(id, 15 - data)); for (int data = 12; data < 15; data++) mapPEtoPC.put(new BaseBlock(id, data), new BaseBlock(id, 27 - data)); - mapPEtoPC.put(new BaseBlock(id, 2), new BaseBlock(id, 0)); + mapPEtoPC.put(new BaseBlock(id, 0), new BaseBlock(id, 2)); mapPEtoPC.put(new BaseBlock(id, 3), new BaseBlock(id, 1)); - - mapPEtoPC.put(new BaseBlock(id, 7), new BaseBlock(id, 9)); + mapPEtoPC.put(new BaseBlock(id, 9), new BaseBlock(id, 7)); mapPEtoPC.put(new BaseBlock(id, 6), new BaseBlock(id, 8)); } diff --git a/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/MCAFile2LevelDB.java b/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/MCAFile2LevelDB.java index bd2341cb..76dd487e 100644 --- a/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/MCAFile2LevelDB.java +++ b/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/MCAFile2LevelDB.java @@ -27,7 +27,6 @@ import com.sk89q.jnbt.NamedTag; import com.sk89q.jnbt.ShortTag; import com.sk89q.jnbt.StringTag; import com.sk89q.worldedit.blocks.BaseBlock; -import com.sk89q.worldedit.blocks.BlockID; import com.sk89q.worldedit.world.registry.BundledBlockData; import java.io.ByteArrayOutputStream; import java.io.DataOutput; @@ -488,19 +487,21 @@ public class MCAFile2LevelDB extends MapConverter { map.put("Version", new IntTag(3)); BaseBlock block = chunk.getBlock(x & 15, y, z & 15); + int LPCommandMode = 0; switch (block.getId()) { - case BlockID.CHAIN_COMMAND_BLOCK: + case 189: LPCommandMode = 2; break; - case BlockID.REPEATING_COMMAND_BLOCK: + case 188: LPCommandMode = 1; break; } + map.putIfAbsent("isMovable", new ByteTag((byte) 1)); map.put("LPCommandMode", new IntTag(LPCommandMode)); map.put("LPCondionalMode", new ByteTag((byte) (block.getData() > 7 ? 1 : 0))); - map.put("LPRedstoneMode", new ByteTag(tag.getByte("auto"))); + map.put("LPRedstoneMode", new ByteTag((byte) (tag.getByte("auto") == 0 ? 1 : 0))); break; } }