diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index 9f7d4023..fe2cecb3 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -32,6 +32,11 @@ public class ConfigManager { earthbendable.add("SAND"); earthbendable.add("SANDSTONE"); earthbendable.add("MYCEL"); + + ArrayList metals = new ArrayList(); + metals.add("IRON_BLOCK"); + metals.add("GOLD_BLOCK"); + metals.add("QUARTZ_BLOCK"); config.addDefault("Properties.Chat.Enable", true); config.addDefault("Properties.Chat.Format", ": "); @@ -84,6 +89,7 @@ public class ConfigManager { config.addDefault("Properties.Earth.RevertCheckTime", 300000); config.addDefault("Properties.Earth.CanBendWithWeapons", true); config.addDefault("Properties.Earth.EarthbendableBlocks", earthbendable); + config.addDefault("Properties.Earth.MetalBlocks", metals); config.addDefault("Properties.Fire.CanBendWithWeapons", true); config.addDefault("Properties.Fire.DayFactor", 1.5); diff --git a/src/com/projectkorra/ProjectKorra/Methods.java b/src/com/projectkorra/ProjectKorra/Methods.java index ab2bda41..6289a6d5 100644 --- a/src/com/projectkorra/ProjectKorra/Methods.java +++ b/src/com/projectkorra/ProjectKorra/Methods.java @@ -1083,6 +1083,11 @@ public class Methods { public static boolean isEarthbendable(Player player, Block block) { return isEarthbendable(player, "RaiseEarth", block); } + + public static boolean isMetal(Block block) { + Material material = block.getType(); + return ProjectKorra.plugin.getConfig().getStringList("Properties.Earth.MetalBlocks").contains(material.toString()); + } public static boolean isEarthbendable(Player player, String ability, Block block) { @@ -1093,6 +1098,10 @@ public class Methods { valid = true; break; } + if (isMetal(block) && canMetalbend(player)) { + valid = true; + } + if(!valid) return false; diff --git a/src/config.yml b/src/config.yml index 7a34f134..ac62ed71 100644 --- a/src/config.yml +++ b/src/config.yml @@ -61,6 +61,10 @@ Properties: - SAND - SANDSTONE - MYCEL + MetalBlocks: + - IRON_BLOCK + - GOLD_BLOCK + - QUARTZ_BLOCK Fire: CanBendWithWeapons: true DayFactor: 1.5