Fixed the DB issue with MetalClips.

This commit is contained in:
Brendan Wilson 2014-11-20 10:25:55 -05:00
parent e25f16c535
commit 1b1015a349
2 changed files with 5 additions and 5 deletions

View file

@ -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);

View file

@ -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;
}