Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthew Miller 2018-07-13 22:45:28 +10:00
parent 39c6a5e958
commit 59ca29577c
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
View File

@ -79,7 +79,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
continue; continue;
} }
if (!bukkitItem.getType().getKey().toString().equals(blockState.getBlockType().getId())) { if (!BukkitUtil.equals(blockState.getBlockType(), bukkitItem.getType())) {
// Type id doesn't fit // Type id doesn't fit
continue; continue;
} }
@ -132,7 +132,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
continue; continue;
} }
if (!bukkitItem.getType().getKey().toString().equals(blockState.getBlockType().getId())) { if (!BukkitUtil.equals(blockState.getBlockType(), bukkitItem.getType())) {
// Type id doesn't fit // Type id doesn't fit
continue; continue;
} }

7
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitUtil.java
View File

@ -27,9 +27,11 @@ import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder; 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.block.BlockTypes;
import com.sk89q.worldedit.world.item.ItemTypes; import com.sk89q.worldedit.world.item.ItemTypes;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -39,6 +41,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.List; import java.util.List;
import java.util.Objects;
public final class BukkitUtil { public final class BukkitUtil {
@ -108,6 +111,10 @@ public final class BukkitUtil {
return true; 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 final double EQUALS_PRECISION = 0.0001;
public static org.bukkit.Location toLocation(Location location) { public static org.bukkit.Location toLocation(Location location) {

9
worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/GardenPatchGenerator.java
View File

@ -23,15 +23,12 @@ import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.WorldEditException; 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.RegionFunction;
import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern; import com.sk89q.worldedit.world.block.BlockState;
import com.sun.xml.internal.bind.v2.TODO; import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.Random; import java.util.Random;