From 0632a9ce966cea8c6d5c2e6e62805974a4cc0373 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Tue, 14 Aug 2018 00:38:33 +1000 Subject: [PATCH] Fix some merge issues --- .../java/com/sk89q/jnbt/CompoundTagBuilder.java | 14 +++++++++++++- .../worldedit/command/tool/FloodFillTool.java | 16 ++++++++-------- .../extension/platform/AbstractPlayerActor.java | 2 +- .../function/generator/FloraGenerator.java | 2 +- .../sk89q/worldedit/world/block/BlockTypes.java | 4 ++++ 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java index 83b044eb0..fad4adc44 100644 --- a/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java @@ -135,12 +135,24 @@ public class CompoundTagBuilder { /** * Put the given key and value into the compound tag as a - * {@code LongTag}. + * {@code LongArrayTag}. * * @param key they key * @param value the value * @return this object */ + public CompoundTagBuilder putLongArray(String key, long[] value) { + return put(key, new LongArrayTag(value)); + } + + /** + * Put the given key and value into the compound tag as a + * {@code LongTag}. + * + * @param key they key + * @param value the value + * @return this object + */ public CompoundTagBuilder putLong(String key, long value) { return put(key, new LongTag(value)); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java index bd7b4d341..37644f77f 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java @@ -67,7 +67,7 @@ public class FloodFillTool implements BlockTool { EditSession editSession = session.createEditSession(player); try { - recurse(editSession, world, clicked.toVector().toBlockVector(), + recurse(editSession, clicked.toVector().toBlockVector(), clicked.toVector(), range, initialType, new HashSet()); } catch (WorldEditException e) { throw new RuntimeException(e); @@ -77,7 +77,7 @@ public class FloodFillTool implements BlockTool { return true; } - private void recurse(EditSession editSession, World world, BlockVector pos, Vector origin, int size, BlockType initialType, + private void recurse(EditSession editSession, BlockVector pos, Vector origin, int size, BlockType initialType, Set visited) throws WorldEditException { if (origin.distance(pos) > size || visited.contains(pos)) { @@ -92,17 +92,17 @@ public class FloodFillTool implements BlockTool { return; } - recurse(editSession, world, pos.add(1, 0, 0).toBlockVector(), + recurse(editSession, pos.add(1, 0, 0).toBlockVector(), origin, size, initialType, visited); - recurse(editSession, world, pos.add(-1, 0, 0).toBlockVector(), + recurse(editSession, pos.add(-1, 0, 0).toBlockVector(), origin, size, initialType, visited); - recurse(editSession, world, pos.add(0, 0, 1).toBlockVector(), + recurse(editSession, pos.add(0, 0, 1).toBlockVector(), origin, size, initialType, visited); - recurse(editSession, world, pos.add(0, 0, -1).toBlockVector(), + recurse(editSession, pos.add(0, 0, -1).toBlockVector(), origin, size, initialType, visited); - recurse(editSession, world, pos.add(0, 1, 0).toBlockVector(), + recurse(editSession, pos.add(0, 1, 0).toBlockVector(), origin, size, initialType, visited); - recurse(editSession, world, pos.add(0, -1, 0).toBlockVector(), + recurse(editSession, pos.add(0, -1, 0).toBlockVector(), origin, size, initialType, visited); } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java index ab38922cd..bf4da5a9d 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java @@ -104,7 +104,7 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable { byte free = 0; - while (y <= world.getMinimumPoint().getBlockY() + 2) { + while (y <= world.getMaximumPoint().getBlockY() + 2) { if (!world.getBlock(new Vector(x, y, z)).getBlockType().getMaterial().isMovementBlocker()) { ++free; } else { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java index 6f2092d69..2729f8506 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java @@ -96,7 +96,7 @@ public class FloraGenerator implements RegionFunction { */ public static Pattern getTemperatePattern() { RandomPattern pattern = new RandomPattern(); - pattern.add(new BlockPattern(BlockTypes.GRASS_BLOCK.getDefaultState()), 300); + pattern.add(new BlockPattern(BlockTypes.GRASS.getDefaultState()), 300); pattern.add(new BlockPattern(BlockTypes.POPPY.getDefaultState()), 5); pattern.add(new BlockPattern(BlockTypes.DANDELION.getDefaultState()), 5); return pattern; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java index ac100faec..64e116542 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java @@ -1011,6 +1011,10 @@ public enum BlockTypes implements BlockType { return existing; } + public static final @Nullable BlockTypes get(final String id) { + return $REGISTRY.get(id); + } + public static final @Nullable BlockTypes get(final CharSequence id) { return $REGISTRY.get(id); }