From 9f1bf514678b933b4ff856a0c25edc0be3205e37 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Tue, 12 Jan 2016 23:07:34 +1100 Subject: [PATCH] Fix torch direction --- src/main/java/com/boydti/fawe/FaweAPI.java | 3 --- .../com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java | 6 +++--- .../fawe/bukkit/v1_8/BukkitEditSessionWrapper_1_8.java | 3 --- .../com/boydti/fawe/bukkit/v1_8/FaweGenerator_1_8.java | 3 --- src/main/java/com/boydti/fawe/command/FixLighting.java | 2 +- .../java/com/boydti/fawe/logging/LoggingExtent.java | 3 --- .../com/boydti/fawe/object/FastWorldEditExtent.java | 10 ++++++---- .../java/com/boydti/fawe/object/HistoryExtent.java | 3 --- .../java/com/boydti/fawe/object/ProcessedWEExtent.java | 10 ++++++---- 9 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/boydti/fawe/FaweAPI.java b/src/main/java/com/boydti/fawe/FaweAPI.java index 15b72abb..0b6014c3 100644 --- a/src/main/java/com/boydti/fawe/FaweAPI.java +++ b/src/main/java/com/boydti/fawe/FaweAPI.java @@ -251,7 +251,6 @@ public class FaweAPI { case 47: case 48: case 49: - case 50: case 51: case 55: case 56: @@ -265,8 +264,6 @@ public class FaweAPI { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: diff --git a/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java b/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java index 1579d04a..8bbe65f6 100644 --- a/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java +++ b/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java @@ -131,10 +131,8 @@ public class BukkitChunk_1_8 extends FaweChunk { case 11: case 39: case 40: - case 50: case 51: case 74: - case 76: case 89: case 122: case 124: @@ -168,7 +166,7 @@ public class BukkitChunk_1_8 extends FaweChunk { case 8: case 9: case 73: - case 75: + case 78: case 79: case 80: @@ -203,6 +201,7 @@ public class BukkitChunk_1_8 extends FaweChunk { vs[j] = (char) (id << 4); return; case 130: + case 76: case 62: relight[i]++; case 54: @@ -210,6 +209,7 @@ public class BukkitChunk_1_8 extends FaweChunk { case 61: case 65: case 68: + case 50: if (data < 2) { data = 2; } diff --git a/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitEditSessionWrapper_1_8.java b/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitEditSessionWrapper_1_8.java index a36323c1..73089ec2 100644 --- a/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitEditSessionWrapper_1_8.java +++ b/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitEditSessionWrapper_1_8.java @@ -91,7 +91,6 @@ public class BukkitEditSessionWrapper_1_8 extends BukkitEditSessionWrapper_0 { case 47: case 48: case 49: - case 50: case 51: case 52: case 54: @@ -109,8 +108,6 @@ public class BukkitEditSessionWrapper_1_8 extends BukkitEditSessionWrapper_0 { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: diff --git a/src/main/java/com/boydti/fawe/bukkit/v1_8/FaweGenerator_1_8.java b/src/main/java/com/boydti/fawe/bukkit/v1_8/FaweGenerator_1_8.java index abf724bd..ae95ca09 100644 --- a/src/main/java/com/boydti/fawe/bukkit/v1_8/FaweGenerator_1_8.java +++ b/src/main/java/com/boydti/fawe/bukkit/v1_8/FaweGenerator_1_8.java @@ -236,7 +236,6 @@ public class FaweGenerator_1_8 extends ChunkGenerator implements Listener { case 47: case 48: case 49: - case 50: case 51: case 55: case 56: @@ -250,8 +249,6 @@ public class FaweGenerator_1_8 extends ChunkGenerator implements Listener { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: diff --git a/src/main/java/com/boydti/fawe/command/FixLighting.java b/src/main/java/com/boydti/fawe/command/FixLighting.java index dd0961e9..23a708d2 100644 --- a/src/main/java/com/boydti/fawe/command/FixLighting.java +++ b/src/main/java/com/boydti/fawe/command/FixLighting.java @@ -43,7 +43,7 @@ public class FixLighting extends FaweCommand { for (int x = minX; x <= maxX; x++) { for (int z = minZ; z <= maxZ; z++) { ChunkLoc cl = new ChunkLoc(loc.world, x, z); - FaweAPI.fixLighting(new ChunkLoc(loc.world, x >> 4, z >> 4), Settings.FIX_ALL_LIGHTING); + FaweAPI.fixLighting(cl, Settings.FIX_ALL_LIGHTING); count++; } } diff --git a/src/main/java/com/boydti/fawe/logging/LoggingExtent.java b/src/main/java/com/boydti/fawe/logging/LoggingExtent.java index a1df320e..59493b2a 100644 --- a/src/main/java/com/boydti/fawe/logging/LoggingExtent.java +++ b/src/main/java/com/boydti/fawe/logging/LoggingExtent.java @@ -91,7 +91,6 @@ public class LoggingExtent extends AbstractDelegateExtent { case 47: case 48: case 49: - case 50: case 51: case 52: case 54: @@ -109,8 +108,6 @@ public class LoggingExtent extends AbstractDelegateExtent { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: diff --git a/src/main/java/com/boydti/fawe/object/FastWorldEditExtent.java b/src/main/java/com/boydti/fawe/object/FastWorldEditExtent.java index 884fa41b..dcc4ebb3 100644 --- a/src/main/java/com/boydti/fawe/object/FastWorldEditExtent.java +++ b/src/main/java/com/boydti/fawe/object/FastWorldEditExtent.java @@ -59,7 +59,12 @@ public class FastWorldEditExtent extends AbstractDelegateExtent { return lastBlock; } if (!SetQueue.IMP.isChunkLoaded(world, position.getBlockX() >> 4, position.getBlockZ() >> 4)) { - return EditSession.nullBlock; + try { + lastVector = position.toBlockVector(); + return lastBlock = super.getBlock(position); + } catch (Throwable e) { + return EditSession.nullBlock; + } } synchronized (thread) { lastVector = position.toBlockVector(); @@ -121,7 +126,6 @@ public class FastWorldEditExtent extends AbstractDelegateExtent { case 47: case 48: case 49: - case 50: case 51: case 52: case 54: @@ -139,8 +143,6 @@ public class FastWorldEditExtent extends AbstractDelegateExtent { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: diff --git a/src/main/java/com/boydti/fawe/object/HistoryExtent.java b/src/main/java/com/boydti/fawe/object/HistoryExtent.java index 30d360d1..7f4eca3f 100644 --- a/src/main/java/com/boydti/fawe/object/HistoryExtent.java +++ b/src/main/java/com/boydti/fawe/object/HistoryExtent.java @@ -76,7 +76,6 @@ public class HistoryExtent extends AbstractDelegateExtent { case 47: case 48: case 49: - case 50: case 51: case 52: case 54: @@ -94,8 +93,6 @@ public class HistoryExtent extends AbstractDelegateExtent { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: diff --git a/src/main/java/com/boydti/fawe/object/ProcessedWEExtent.java b/src/main/java/com/boydti/fawe/object/ProcessedWEExtent.java index a637464f..d0a2c763 100644 --- a/src/main/java/com/boydti/fawe/object/ProcessedWEExtent.java +++ b/src/main/java/com/boydti/fawe/object/ProcessedWEExtent.java @@ -96,7 +96,12 @@ public class ProcessedWEExtent extends AbstractDelegateExtent { return lastBlock; } if (!SetQueue.IMP.isChunkLoaded(world, position.getBlockX() >> 4, position.getBlockZ() >> 4)) { - return EditSession.nullBlock; + try { + lastVector = position.toBlockVector(); + return lastBlock = super.getBlock(position); + } catch (Throwable e) { + return EditSession.nullBlock; + } } synchronized (thread) { lastVector = position.toBlockVector(); @@ -218,7 +223,6 @@ public class ProcessedWEExtent extends AbstractDelegateExtent { case 47: case 48: case 49: - case 50: case 51: case 52: case 54: @@ -236,8 +240,6 @@ public class ProcessedWEExtent extends AbstractDelegateExtent { case 11: case 73: case 74: - case 75: - case 76: case 78: case 79: case 80: