diff --git a/src/main/java/com/griefcraft/bukkit/EntityBlock.java b/src/main/java/com/griefcraft/bukkit/EntityBlock.java index ab3fb800..10e8b555 100644 --- a/src/main/java/com/griefcraft/bukkit/EntityBlock.java +++ b/src/main/java/com/griefcraft/bukkit/EntityBlock.java @@ -39,9 +39,6 @@ import org.bukkit.block.BlockState; import org.bukkit.block.PistonMoveReaction; import org.bukkit.entity.Entity; -import org.bukkit.entity.ItemFrame; -import org.bukkit.entity.Painting; -import org.bukkit.entity.StorageMinecart; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; @@ -70,22 +67,6 @@ public EntityBlock(Entity entity) { this.entity = entity; } - /** - * The name of these entity block. Used to represent the "material" for configuration, mainly. - * @return - */ - public String getName() { - if (entity instanceof Painting) { - return "painting"; - } else if (entity instanceof ItemFrame) { - return "item_frame"; - } else if (entity instanceof StorageMinecart) { - return "storage_minecart"; - } - - return "entity"; - } - public int getX() { return POSITION_OFFSET + entity.getUniqueId().hashCode(); } diff --git a/src/main/java/com/griefcraft/lwc/LWC.java b/src/main/java/com/griefcraft/lwc/LWC.java index 6560eeb6..18d5b1db 100644 --- a/src/main/java/com/griefcraft/lwc/LWC.java +++ b/src/main/java/com/griefcraft/lwc/LWC.java @@ -1135,7 +1135,7 @@ private void removeBlocks(CommandSender sender, List blocks) { */ public boolean isProtectable(Block block) { if (block instanceof EntityBlock) { - return Boolean.parseBoolean(resolveProtectionConfiguration(((EntityBlock) block).getName(), "enabled")); + return true; // TODO } return isProtectable(block.getType()); @@ -1385,23 +1385,6 @@ public String resolveProtectionConfiguration(Material material, String node) { return value; } - /** - * Get the appropriate config value for the block (protections.block.node) - * - * @param name - * @param node - * @return - */ - public String resolveProtectionConfiguration(String name, String node) { - String value = configuration.getString("protections." + node); - - if (value == null) { - value = configuration.getString("protections.blocks." + name + "." + node); - } - - return value; - } - /** * Load sqlite (done only when LWC is loaded so memory isn't used unnecessarily) */