From 20b7cf7e9d812c161d2a8c3a55b22a8b3e692695 Mon Sep 17 00:00:00 2001
From: OmniCypher <OmniCypher@yahoo.com>
Date: Fri, 25 Sep 2015 22:32:50 -0700
Subject: [PATCH] Fix canBend NPE & IceBullet

---
 src/com/projectkorra/projectkorra/GeneralMethods.java         | 4 +++-
 .../projectkorra/projectkorra/ability/combo/ComboManager.java | 1 -
 .../projectkorra/configuration/ConfigManager.java             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/GeneralMethods.java b/src/com/projectkorra/projectkorra/GeneralMethods.java
index bab44973..21cb14c6 100644
--- a/src/com/projectkorra/projectkorra/GeneralMethods.java
+++ b/src/com/projectkorra/projectkorra/GeneralMethods.java
@@ -285,7 +285,9 @@ public class GeneralMethods {
 		Player p = Bukkit.getPlayer(player);
 		if (bPlayer == null)
 			return false;
-		if (plugin.getConfig().getStringList("Properties.DisabledWorlds") != null && plugin.getConfig().getStringList("Properties.DisabledWorlds").contains(p.getWorld().getName()))
+		if (p == null)
+			return false;
+		if (plugin.getConfig().getStringList("Properties.DisabledWorlds") != null && p.getWorld() != null && plugin.getConfig().getStringList("Properties.DisabledWorlds").contains(p.getWorld().getName()))
 			return false;
 		if (Commands.isToggledForAll)
 			return false;
diff --git a/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java b/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java
index 1c2a508f..f3aa2e57 100644
--- a/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java
+++ b/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java
@@ -136,7 +136,6 @@ public class ComboManager {
 		iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_DOWN));
 		iceBullet.add(new AbilityInformation("WaterBubble", ClickType.SHIFT_UP));
 		iceBullet.add(new AbilityInformation("IceBlast", ClickType.SHIFT_DOWN));
-		iceBullet.add(new AbilityInformation("IceBlast", ClickType.LEFT_CLICK));
 		comboAbilityList.put("IceBullet", new ComboAbility("IceBullet", iceBullet, WaterCombo.class));
 		descriptions.put("IceBullet", "Using a large cavern of ice, you can punch ice shards at your opponent causing moderate damage. To rapid fire, you must alternate between Left clicking and right clicking with IceBlast.");
 		instructions.put("IceBullet", "WaterBubble (Tap Shift) > IceBlast (Hold Shift) > IceBlast (Left Click) > Wait for ice to Form > Then alternate between Left and Right click with IceBlast");
diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
index 0804fe12..2f4a8d88 100644
--- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
+++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
@@ -467,7 +467,7 @@ public class ConfigManager {
 				config.addDefault("Abilities.Water.WaterCombo.IceBullet.Range", 12);
 				config.addDefault("Abilities.Water.WaterCombo.IceBullet.MaxShots", 30);
 				config.addDefault("Abilities.Water.WaterCombo.IceBullet.AnimationSpeed", 1);
-				config.addDefault("Abilities.Water.WaterCombo.IceBullet.ShootTime", 5000);
+				config.addDefault("Abilities.Water.WaterCombo.IceBullet.ShootTime", 10000);
 				config.addDefault("Abilities.Water.WaterCombo.IceBullet.Cooldown", 10000);
 
 				config.addDefault("Abilities.Earth.Passive.Duration", 2500);