From bbece259e163ce01fdd6efdc51946881bf13b629 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Thu, 10 Jul 2014 10:30:13 -0400 Subject: [PATCH] Begin Metalbending If you land on a metal block and you have metalbending permissions, you will not take fall damage. --- src/com/projectkorra/ProjectKorra/Commands.java | 1 - src/com/projectkorra/ProjectKorra/Methods.java | 6 +++++- .../ProjectKorra/waterbending/WaterManipulation.java | 2 ++ src/plugin.yml | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/Commands.java b/src/com/projectkorra/ProjectKorra/Commands.java index f12f83b5..b433fd49 100644 --- a/src/com/projectkorra/ProjectKorra/Commands.java +++ b/src/com/projectkorra/ProjectKorra/Commands.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/com/projectkorra/ProjectKorra/Methods.java b/src/com/projectkorra/ProjectKorra/Methods.java index fe1a83fb..1cfc1e22 100644 --- a/src/com/projectkorra/ProjectKorra/Methods.java +++ b/src/com/projectkorra/ProjectKorra/Methods.java @@ -64,7 +64,6 @@ import com.projectkorra.ProjectKorra.airbending.AirSpout; import com.projectkorra.ProjectKorra.airbending.AirSuction; import com.projectkorra.ProjectKorra.airbending.AirSwipe; import com.projectkorra.ProjectKorra.airbending.Tornado; -import com.projectkorra.ProjectKorra.chiblocking.ChiPassive; import com.projectkorra.ProjectKorra.chiblocking.RapidPunch; import com.projectkorra.ProjectKorra.earthbending.Catapult; import com.projectkorra.ProjectKorra.earthbending.CompactColumn; @@ -1614,6 +1613,11 @@ public class Methods { return false; } + + public static boolean canMetalbend(Player player) { + if (player.hasPermission("bending.earth.metalbending")) return true; + return false; + } private static Integer[] plantIds = { 6, 18, 31, 32, 37, 38, 39, 40, 59, 81, 83, 86, 99, 100, 103, 104, 105, 106, 111, 161, 175}; public static Integer[] transparentToEarthbending = {0, 6, 8, 9, 10, 11, 30, 31, 32, 37, 38, 39, 40, 50, 51, 59, 78, 83, 106}; diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterManipulation.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterManipulation.java index 29e0b1c6..d967a9d0 100644 --- a/src/com/projectkorra/ProjectKorra/waterbending/WaterManipulation.java +++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterManipulation.java @@ -6,9 +6,11 @@ import java.util.HashSet; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.bukkit.Bukkit; import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; diff --git a/src/plugin.yml b/src/plugin.yml index 5545be64..bf07022c 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -82,6 +82,7 @@ permissions: bending.ability.Shockwave: true bending.ability.Tremorsense: true bending.earth.passive: true + bending.earth.metalbending: true bending.fire: default: true description: Grants access to all firebending abilities.