From a84348f478f7b534ba12c65ea29e1ec3ef31ed54 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Wed, 16 Aug 2017 14:22:48 +1000 Subject: [PATCH] Fix forge chunk 1.7.10 set --- core/src/main/java/com/boydti/fawe/util/metrics/BStats.java | 6 +++--- .../java/com/boydti/fawe/forge/v1710/ForgeChunk_All.java | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/boydti/fawe/util/metrics/BStats.java b/core/src/main/java/com/boydti/fawe/util/metrics/BStats.java index ab2169c6..aeb33234 100644 --- a/core/src/main/java/com/boydti/fawe/util/metrics/BStats.java +++ b/core/src/main/java/com/boydti/fawe/util/metrics/BStats.java @@ -21,9 +21,9 @@ import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import javax.net.ssl.HttpsURLConnection; @@ -59,7 +59,7 @@ public class BStats implements Closeable { private boolean logFailedRequests = false; // A list with all known metrics class objects including this one - private static final List knownMetricsInstances = new ArrayList<>(); + private static final Collection knownMetricsInstances = new ConcurrentLinkedQueue<>(); public BStats() { this("FastAsyncWorldEdit", Fawe.get().getVersion().toString(), Fawe.imp().getPlatformVersion(), Fawe.imp().getPlatform(), Fawe.imp().isOnlineMode()); diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeChunk_All.java b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeChunk_All.java index 0c5f6132..d1e96538 100644 --- a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeChunk_All.java +++ b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeChunk_All.java @@ -84,6 +84,11 @@ public class ForgeChunk_All extends CharFaweChunk { return extended[i]; } + @Override + public void setBlock(int x, int y, int z, int id) { + setBlock(x, y, z, id, 0); + } + @Override public void setBlock(int x, int y, int z, int id, int data) { int i = FaweCache.CACHE_I[y][z][x]; @@ -137,7 +142,6 @@ public class ForgeChunk_All extends CharFaweChunk { } nibble.set(x, y & 15, z, id >> 8); } - return; } }