From 1b1015a3499f4a2a0212486cd72ccbffa8f6fe91 Mon Sep 17 00:00:00 2001 From: Brendan Wilson Date: Thu, 20 Nov 2014 10:25:55 -0500 Subject: [PATCH] Fixed the DB issue with MetalClips. --- src/com/projectkorra/ProjectKorra/ConfigManager.java | 4 ++-- .../projectkorra/ProjectKorra/earthbending/MetalClips.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index dd722ea2..ed2be09d 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -459,8 +459,8 @@ public class ConfigManager { config.addDefault("Abilities.Earth.MetalClips.Enabled", true); config.addDefault("Abilities.Earth.MetalClips.Description", "Shoot multiple metal clips at your enemy to slowly encase them in metal, allowing you to control their movements. This ability only works on Zombies, Skeletons, and Players. You need iron in your inventory to use this ability."); - config.addDefault("Abilities.Earth.MetalClips.Damage", 1); - config.addDefault("Abilities.Earth.MetalClips.DamageInterval", 1400); + config.addDefault("Abilities.Earth.MetalClips.Damage", 3); + config.addDefault("Abilities.Earth.MetalClips.DamageInterval", 1000); config.addDefault("Abilities.Earth.MetalClips.Cooldown", 1000); config.addDefault("Abilities.Earth.MetalClips.Duration", 10000); diff --git a/src/com/projectkorra/ProjectKorra/earthbending/MetalClips.java b/src/com/projectkorra/ProjectKorra/earthbending/MetalClips.java index 928efced..b48c12ed 100644 --- a/src/com/projectkorra/ProjectKorra/earthbending/MetalClips.java +++ b/src/com/projectkorra/ProjectKorra/earthbending/MetalClips.java @@ -222,7 +222,7 @@ public class MetalClips Vector v = Methods.getDirection(target.getLocation(), player.getLocation()); - if(distance > 2.5) + if(distance > .5) target.setVelocity(v.normalize().multiply(0.1)); Methods.breakBreathbendingHold(target); @@ -237,7 +237,7 @@ public class MetalClips Vector v = Methods.getDirection(target.getLocation(), player.getLocation()); - if(distance > 2.5) + if(distance > .5) target.setVelocity(v.normalize().multiply(0.2)); Methods.breakBreathbendingHold(target); @@ -357,7 +357,7 @@ public class MetalClips { for(Player p : instances.keySet()) { - if(instances.get(p).getTarget().getEntityId() == player.getEntityId()) + if(instances.get(p).getTarget() != null && instances.get(p).getTarget().getEntityId() == player.getEntityId()) { return true; }