Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-28 21:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix for 1.10

Browse Source
This commit is contained in:
Jesse Boyd 2017-03-05 00:43:32 +11:00
parent e9250d6e7c
commit 9c805f2de2
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
View File

@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutorCompletionService;
import net.minecraft.server.v1_10_R1.BiomeBase; import net.minecraft.server.v1_10_R1.BiomeBase;
import net.minecraft.server.v1_10_R1.BiomeCache; import net.minecraft.server.v1_10_R1.BiomeCache;
import net.minecraft.server.v1_10_R1.Block; 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); fieldTickingBlockCount.setAccessible(true);
fieldNonEmptyBlockCount.setAccessible(true); fieldNonEmptyBlockCount.setAccessible(true);
fieldBiomes = ChunkProviderGenerate.class.getDeclaredField("D"); fieldBiomes = ChunkProviderGenerate.class.getDeclaredField("C");
fieldBiomes.setAccessible(true); fieldBiomes.setAccessible(true);
fieldChunkGenerator = ChunkProviderServer.class.getDeclaredField("chunkGenerator"); fieldChunkGenerator = ChunkProviderServer.class.getDeclaredField("chunkGenerator");
fieldChunkGenerator.setAccessible(true); fieldChunkGenerator.setAccessible(true);
fieldSeed = WorldData.class.getDeclaredField("e"); fieldSeed = WorldData.class.getDeclaredField("e");
fieldSeed.setAccessible(true); fieldSeed.setAccessible(true);
fieldBiomeCache = WorldChunkManager.class.getDeclaredField("d"); fieldBiomeCache = WorldChunkManager.class.getDeclaredField("c");
fieldBiomeCache.setAccessible(true); fieldBiomeCache.setAccessible(true);
fieldBiomes2 = WorldChunkManager.class.getDeclaredField("e"); fieldBiomes2 = WorldChunkManager.class.getDeclaredField("d");
fieldBiomes2.setAccessible(true); fieldBiomes2.setAccessible(true);
fieldGenLayer1 = WorldChunkManager.class.getDeclaredField("b") ; fieldGenLayer1 = WorldChunkManager.class.getDeclaredField("a") ;
fieldGenLayer2 = WorldChunkManager.class.getDeclaredField("c") ; fieldGenLayer2 = WorldChunkManager.class.getDeclaredField("b") ;
fieldGenLayer1.setAccessible(true); fieldGenLayer1.setAccessible(true);
fieldGenLayer2.setAccessible(true); fieldGenLayer2.setAccessible(true);

5
core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
View File

@ -16,6 +16,7 @@ import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.util.command.binding.Switch;
import com.sk89q.worldedit.util.command.parametric.Optional; import com.sk89q.worldedit.util.command.parametric.Optional;
/** /**
@ -165,7 +166,7 @@ public class ToolUtilCommands {
max = 1 max = 1
) )
@CommandPermissions("worldedit.brush.options.material") @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()); Tool tool = session.getTool(player.getItemInHand());
if (tool instanceof BrushTool) { if (tool instanceof BrushTool) {
((BrushTool) tool).setFill(pattern); ((BrushTool) tool).setFill(pattern);
@ -198,7 +199,7 @@ public class ToolUtilCommands {
max = 1 max = 1
) )
@CommandPermissions("worldedit.brush.options.size") @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); int radius = args.getInteger(0);
we.checkMaxBrushRadius(radius); we.checkMaxBrushRadius(radius);