Fixes #1303

Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java

@@ -4,6 +4,8 @@ import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -126,4 +128,60 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
             }
         }
     }
+
+    private Field fieldNeighbors;
+    private Method chunkGetHandle;
+
+    /**
+     * Exploiting a bug in the vanilla lighting algorithm for faster block placement
+     *  - Could have been achieved without reflection by force unloading specific chunks
+     *  - Much faster just setting the variable manually though
+     * @param chunk
+     * @return
+     */
+    protected Object[] disableLighting(Chunk chunk) {
+        try {
+            if (chunkGetHandle == null) {
+                chunkGetHandle = chunk.getClass().getDeclaredMethod("getHandle");
+                chunkGetHandle.setAccessible(true);
+            }
+            Object nmsChunk = chunkGetHandle.invoke(chunk);
+            if (fieldNeighbors == null) {
+                fieldNeighbors = nmsChunk.getClass().getDeclaredField("neighbors");
+                fieldNeighbors.setAccessible(true);
+            }
+            Object value = fieldNeighbors.get(nmsChunk);
+            fieldNeighbors.set(nmsChunk, 0);
+            return new Object[] {nmsChunk, value};
+        } catch (Throwable ignore) {}
+        return null;
+    }
+
+    protected void disableLighting(Object[] disableResult) {
+        if (disableResult != null) {
+            try {
+                fieldNeighbors.set(disableResult[0], 0);
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    protected void resetLighting(Object[] disableResult) {
+        if (disableResult != null) {
+            try {
+                fieldNeighbors.set(disableResult[0], disableResult[1]);
+            } catch (Throwable ignore) {
+                ignore.printStackTrace();
+            }
+        }
+    }
+
+    protected void enableLighting(Object[] disableResult) {
+        if (disableResult != null) {
+            try {
+                fieldNeighbors.set(disableResult[0], 0x739C0);
+            } catch (Throwable ignore) {}
+        }
+    }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java

@@ -1,9 +1,7 @@
 package com.plotsquared.bukkit.util.block;
 
-import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.ChunkWrapper;
 import com.intellectualcrafters.plot.object.PseudoRandom;
-import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.ReflectionUtils;
 import com.intellectualcrafters.plot.util.block.BasicLocalBlockQueue;
@@ -380,33 +378,17 @@ public class BukkitLocalQueue_1_9 extends BukkitLocalQueue<char[]> {
             Object c = this.methodGetHandleChunk.of(chunk).call();
 
             ChunkWrapper wrapper = new ChunkWrapper(getWorld(), bc.getX(), bc.getZ());
-            if (fixAll && !(boolean) this.methodAreNeighborsLoaded.of(c).call(1)) {
+            Object[] result = disableLighting(chunk);
-                World world = chunk.getWorld();
+            enableLighting(result);
-                for (int x = wrapper.x - 1; x <= wrapper.x + 1; x++) {
-                    for (int z = wrapper.z - 1; z <= wrapper.z + 1; z++) {
-                        if (x != 0 && z != 0) {
-                            Chunk other = world.getChunkAt(x, z);
-                            while (!other.isLoaded()) {
-                                other.load(true);
-                            }
-                            ChunkManager.manager.loadChunk(getWorld(), new ChunkLoc(x, z), true);
-                        }
-                    }
-                }
-            }
 
             this.methodInitLighting.of(c).call();
 
-            if (bc.getTotalRelight() == 0 && !fixAll) {
+            if (bc.getTotalRelight() != 0 || fixAll) {
-                return true;
-            }
-
                 Object[] sections = (Object[]) this.fieldSections.of(c).get();
                 Object w = this.fieldWorld.of(c).get();
 
                 int X = chunk.getX() << 4;
                 int Z = chunk.getZ() << 4;
-
                 ReflectionUtils.RefMethod.RefExecutor relight = this.methodW.of(w);
                 for (int j = 0; j < sections.length; j++) {
                     Object section = sections[j];
@@ -461,6 +443,8 @@ public class BukkitLocalQueue_1_9 extends BukkitLocalQueue<char[]> {
                         }
                     }
                 }
+            }
+            resetLighting(result);
             return true;
         } catch (Throwable e) {
             e.printStackTrace();