From 3203a81710ddc090ec5a5535ceddd6815e01602e Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 5 Aug 2018 22:19:46 +1000 Subject: [PATCH] Use BlockTarget for blocks. --- .../java/com/sk89q/worldguard/bukkit/BukkitUtil.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java index 8c159b76..6e5af968 100644 --- a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.sk89q.worldedit.bukkit.BukkitAdapter; +import com.sk89q.worldguard.blacklist.target.BlockTarget; import com.sk89q.worldguard.blacklist.target.ItemTarget; import com.sk89q.worldguard.blacklist.target.Target; import org.bukkit.ChatColor; @@ -186,7 +187,7 @@ public static boolean isIntensiveEntity(Entity entity) { */ public static Target createTarget(Block block) { checkNotNull(block); - return new ItemTarget(BukkitAdapter.adapt(block.getBlockData()).getBlockType().getItemType()); + return new BlockTarget(BukkitAdapter.adapt(block.getBlockData()).getBlockType()); } /** @@ -208,6 +209,10 @@ public static Target createTarget(ItemStack item) { */ public static Target createTarget(Material material) { checkNotNull(material); - return new ItemTarget(BukkitAdapter.asItemType(material)); + if (material.isBlock()) { + return new BlockTarget(BukkitAdapter.asBlockType(material)); + } else { + return new ItemTarget(BukkitAdapter.asItemType(material)); + } } }