From 90ba392692f1e74b656339fed870863f9660280e Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 29 Nov 2016 19:15:45 +1100
Subject: [PATCH] Fix forge regen

---
 .../boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java  |  1 -
 .../src/main/java/com/boydti/fawe/config/BBC.java |  4 ++--
 .../com/boydti/fawe/example/CharFaweChunk.java    |  3 ---
 .../com/boydti/fawe/forge/v0/ForgeQueue_All.java  |  2 +-
 .../com/boydti/fawe/forge/v0/ForgeQueue_All.java  | 15 ---------------
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
index 981266a7..07f500ee 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
@@ -122,7 +122,6 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
             case 62:
             case 50:
             case 10:
-                getParent().getRelighter().addLightUpdate((getX() << 4) + x, y, (getZ() << 4) + z);
             default:
                 vs2[j] = (char) ((id << 4) + data);
                 vs[j] = (byte) id;
diff --git a/core/src/main/java/com/boydti/fawe/config/BBC.java b/core/src/main/java/com/boydti/fawe/config/BBC.java
index 3828f7fa..2d36b99d 100644
--- a/core/src/main/java/com/boydti/fawe/config/BBC.java
+++ b/core/src/main/java/com/boydti/fawe/config/BBC.java
@@ -180,8 +180,8 @@ public enum BBC {
     WORLDEDIT_CANCEL_REASON_MAX_TILES("Too many blockstates", "Cancel"),
     WORLDEDIT_CANCEL_REASON_MAX_ENTITIES("Too many entities", "Cancel"),
     WORLDEDIT_CANCEL_REASON_MAX_ITERATIONS("Max iterations", "Cancel"),
-    WORLDEDIT_CANCEL_REASON_MAX_FAILS("Outside allowed region (bypass with /wea)", "Cancel"),
-    WORLDEDIT_CANCEL_REASON_NO_REGION("No allowed region (bypass with /wea)", "Cancel"),
+    WORLDEDIT_CANCEL_REASON_MAX_FAILS("Outside allowed region (bypass with /wea, or disable `region-restrictions` in config.yml)", "Cancel"),
+    WORLDEDIT_CANCEL_REASON_NO_REGION("No allowed region (bypass with /wea, or disable `region-restrictions` in config.yml)", "Cancel"),
     WORLDEDIT_FAILED_LOAD_CHUNK("&cSkipped loading chunk: &7%s0;%s1&c. Try increasing chunk-wait.", "Cancel"),
 
     LOADING_CLIPBOARD("Loading clipboard from disk, please wait.", "History"),
diff --git a/core/src/main/java/com/boydti/fawe/example/CharFaweChunk.java b/core/src/main/java/com/boydti/fawe/example/CharFaweChunk.java
index 4958a254..64877a80 100644
--- a/core/src/main/java/com/boydti/fawe/example/CharFaweChunk.java
+++ b/core/src/main/java/com/boydti/fawe/example/CharFaweChunk.java
@@ -219,7 +219,6 @@ public abstract class CharFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
             case 62:
             case 50:
             case 10:
-                getParent().getRelighter().addLightUpdate((getX() << 4) + x, y, (getZ() << 4) + z);
             default:
                 vs[j] = (char) (id << 4);
                 heightMap[z << 4 | x] = (byte) y;
@@ -254,7 +253,6 @@ public abstract class CharFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
             case 138:
             case 169:
             case 213:
-                getParent().getRelighter().addLightUpdate((getX() << 4) + x, y, (getZ() << 4) + z);
             case 2:
             case 4:
             case 13:
@@ -315,7 +313,6 @@ public abstract class CharFaweChunk<T, V extends FaweQueue> extends FaweChunk<T>
             case 62:
             case 50:
             case 10:
-                getParent().getRelighter().addLightUpdate((getX() << 4) + x, y, (getZ() << 4) + z);
             case 54:
             case 146:
             case 61:
diff --git a/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java b/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java
index cfadffd6..d570193a 100644
--- a/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java
+++ b/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java
@@ -152,7 +152,7 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 mcChunk = chunkServer.loadChunk(x, z);
                 PlayerChunkMapEntry entry = playerManager.getEntry(x, z);
                 if (entry != null) {
-                    Field fieldPlayers = PlayerChunkMap.class.getDeclaredField("players");
+                    Field fieldPlayers = PlayerChunkMap.class.getDeclaredField("field_187283_c");
                     fieldPlayers.setAccessible(true);
                     oldWatchers = (List<EntityPlayerMP>) fieldPlayers.get(entry);
                     playerManager.removeEntry(entry);
diff --git a/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java b/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java
index 8f002547..74d9335a 100644
--- a/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java
+++ b/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeQueue_All.java
@@ -16,7 +16,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -145,17 +144,8 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 mcChunk = chunkServer.loadChunk(x, z);
                 mcChunk.onChunkUnload();
             }
-            PlayerChunkMap playerManager = ((WorldServer) getWorld()).getPlayerChunkMap();
-            List<EntityPlayerMP> oldWatchers = null;
             if (chunkServer.chunkExists(x, z)) {
                 mcChunk = chunkServer.loadChunk(x, z);
-                PlayerChunkMapEntry entry = playerManager.getEntry(x, z);
-                if (entry != null) {
-                    Field fieldPlayers = PlayerChunkMap.class.getDeclaredField("players");
-                    fieldPlayers.setAccessible(true);
-                    oldWatchers = (List<EntityPlayerMP>) fieldPlayers.get(entry);
-                    playerManager.removeEntry(entry);
-                }
                 mcChunk.onChunkUnload();
             }
             try {
@@ -173,11 +163,6 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 mcChunk.onChunkLoad();
                 mcChunk.populateChunk(chunkServer, chunkServer.chunkGenerator);
             }
-            if (oldWatchers != null) {
-                for (EntityPlayerMP player : oldWatchers) {
-                    playerManager.addPlayer(player);
-                }
-            }
             return true;
         } catch (Throwable t) {
             MainUtil.handleError(t);