Remove weird TODO import and moved BlockType == Material to BukkitUtil

EngineHub · Aug 4, 2018 · 59ca295 · 59ca295
1 parent 39c6a5e
commit 59ca295
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
@@ -79,7 +79,7 @@ public void fetchBlock(BlockState blockState) throws BlockBagException {
                 continue;
             }
 
-            if (!bukkitItem.getType().getKey().toString().equals(blockState.getBlockType().getId())) {
+            if (!BukkitUtil.equals(blockState.getBlockType(), bukkitItem.getType())) {
                 // Type id doesn't fit
                 continue;
             }
@@ -132,7 +132,7 @@ public void storeBlock(BlockState blockState, int amount) throws BlockBagExcepti
                 continue;
             }
 
-            if (!bukkitItem.getType().getKey().toString().equals(blockState.getBlockType().getId())) {
+            if (!BukkitUtil.equals(blockState.getBlockType(), bukkitItem.getType())) {
                 // Type id doesn't fit
                 continue;
             }

diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java
@@ -27,9 +27,11 @@
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -39,6 +41,7 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
+import java.util.Objects;
 
 public final class BukkitUtil {
 
@@ -108,6 +111,10 @@ public static boolean equals(org.bukkit.Location a, org.bukkit.Location b) {
         return true;
     }
 
+    public static boolean equals(BlockType blockType, Material type) {
+        return Objects.equals(blockType.getId(), type.getKey().toString());
+    }
+
     public static final double EQUALS_PRECISION = 0.0001;
 
     public static org.bukkit.Location toLocation(Location location) {

diff --git a/...dedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java b/...dedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
@@ -23,15 +23,12 @@
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.function.pattern.RandomPattern;
-import com.sun.xml.internal.bind.v2.TODO;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.Random;