Merge branch '1.16' into vault-fix

2020-09-14 21:19:52 -04:00
parent 9431f7c189 07a5ef5ab4
commit 4af36217b1
33 changed files with 351 additions and 67 deletions
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java
@@ -110,8 +110,6 @@ public final class FAWE_Spigot_v1_16_R2 extends CachedBukkitAdapter implements I
    public BlockMaterial getMaterial(BlockState state) {
        IBlockData bs = ((CraftBlockData) Bukkit.createBlockData(state.getAsString())).getState();
        return new BlockMaterial_1_16_2(bs.getBlock(), bs);
-
-
    }

    public Block getBlock(BlockType blockType) {