From 9c805f2de2687270761bf30c16a3b3b23c5b5f49 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sun, 5 Mar 2017 00:43:32 +1100
Subject: [PATCH] Fix for 1.10

---
 .../boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java    | 11 +++++------
 .../com/sk89q/worldedit/command/ToolUtilCommands.java |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
index 6ea3f7df..37067869 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ExecutorCompletionService;
 import net.minecraft.server.v1_10_R1.BiomeBase;
 import net.minecraft.server.v1_10_R1.BiomeCache;
 import net.minecraft.server.v1_10_R1.Block;
@@ -100,18 +99,18 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<net.minecraft.server.v1_10_R
             fieldTickingBlockCount.setAccessible(true);
             fieldNonEmptyBlockCount.setAccessible(true);
 
-            fieldBiomes = ChunkProviderGenerate.class.getDeclaredField("D");
+            fieldBiomes = ChunkProviderGenerate.class.getDeclaredField("C");
             fieldBiomes.setAccessible(true);
             fieldChunkGenerator = ChunkProviderServer.class.getDeclaredField("chunkGenerator");
             fieldChunkGenerator.setAccessible(true);
             fieldSeed = WorldData.class.getDeclaredField("e");
             fieldSeed.setAccessible(true);
-            fieldBiomeCache = WorldChunkManager.class.getDeclaredField("d");
+            fieldBiomeCache = WorldChunkManager.class.getDeclaredField("c");
             fieldBiomeCache.setAccessible(true);
-            fieldBiomes2 = WorldChunkManager.class.getDeclaredField("e");
+            fieldBiomes2 = WorldChunkManager.class.getDeclaredField("d");
             fieldBiomes2.setAccessible(true);
-            fieldGenLayer1 = WorldChunkManager.class.getDeclaredField("b") ;
-            fieldGenLayer2 = WorldChunkManager.class.getDeclaredField("c") ;
+            fieldGenLayer1 = WorldChunkManager.class.getDeclaredField("a") ;
+            fieldGenLayer2 = WorldChunkManager.class.getDeclaredField("b") ;
             fieldGenLayer1.setAccessible(true);
             fieldGenLayer2.setAccessible(true);
 
diff --git a/core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java b/core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
index db574166..7bc2686e 100644
--- a/core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
+++ b/core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
@@ -16,6 +16,7 @@ import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.util.command.binding.Switch;
 import com.sk89q.worldedit.util.command.parametric.Optional;
 
 /**
@@ -165,7 +166,7 @@ public class ToolUtilCommands {
             max = 1
     )
     @CommandPermissions("worldedit.brush.options.material")
-    public void material(Player player, LocalSession session, Pattern pattern) throws WorldEditException {
+    public void material(Player player, LocalSession session, Pattern pattern, @Switch('h') boolean hand) throws WorldEditException {
         Tool tool = session.getTool(player.getItemInHand());
         if (tool instanceof BrushTool) {
             ((BrushTool) tool).setFill(pattern);
@@ -198,7 +199,7 @@ public class ToolUtilCommands {
             max = 1
     )
     @CommandPermissions("worldedit.brush.options.size")
-    public void size(Player player, LocalSession session, CommandContext args) throws WorldEditException {
+    public void size(Player player, LocalSession session, CommandContext args, @Switch('h') boolean hand) throws WorldEditException {
 
         int radius = args.getInteger(0);
         we.checkMaxBrushRadius(radius);