From 15b542fb98d0e1d1bf8a4388b9dee608e4091dc3 Mon Sep 17 00:00:00 2001
From: MistPhizzle <mistphizzle@gmail.com>
Date: Sat, 27 Sep 2014 13:22:58 -0400
Subject: [PATCH] Fix NPE with Disabled Stock Abilities

---
 .../ProjectKorra/Ability/AbilityModuleManager.java           | 3 ++-
 src/com/projectkorra/ProjectKorra/Methods.java               | 5 +++++
 .../projectkorra/ProjectKorra/firebending/Combustion.java    | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
index b36d753c..dcba64a6 100644
--- a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
+++ b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
@@ -19,7 +19,7 @@ public class AbilityModuleManager {
 	private final AbilityLoader<AbilityModule> loader;
 
 	public static HashSet<String> abilities;
-        public static HashSet<String> disabledStockAbilities;
+    public static HashSet<String> disabledStockAbilities;
 	public static List<String> waterbendingabilities;
 	public static List<String> airbendingabilities;
 	public static List<String> earthbendingabilities;
@@ -55,6 +55,7 @@ public class AbilityModuleManager {
 		igniteabilities = new HashSet<String>();
 		metalbendingabilities = new HashSet<String>();
 		ability = loader.load(AbilityModule.class);
+		disabledStockAbilities = new HashSet<String>();
 		fill();
 	}
 
diff --git a/src/com/projectkorra/ProjectKorra/Methods.java b/src/com/projectkorra/ProjectKorra/Methods.java
index 92f1e487..5f651191 100644
--- a/src/com/projectkorra/ProjectKorra/Methods.java
+++ b/src/com/projectkorra/ProjectKorra/Methods.java
@@ -31,6 +31,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
@@ -2012,5 +2013,9 @@ public class Methods {
 		}
 		return cap;
 	}
+	
+	public static void playFirebendingSound(Location location) {
+		location.getWorld().playSound(location, Sound.FIRE, 10, 1);
+	}
 
 }
diff --git a/src/com/projectkorra/ProjectKorra/firebending/Combustion.java b/src/com/projectkorra/ProjectKorra/firebending/Combustion.java
index 6e279937..c1689c3e 100644
--- a/src/com/projectkorra/ProjectKorra/firebending/Combustion.java
+++ b/src/com/projectkorra/ProjectKorra/firebending/Combustion.java
@@ -159,6 +159,7 @@ public class Combustion {
 	private void advanceLocation() {
 		ParticleEffect.FIREWORKS_SPARK.display(location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 5);
 		ParticleEffect.FLAME.display(location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 2);
+		Methods.playFirebendingSound(location);
 		location = location.add(direction.clone().multiply(speedfactor));
 	}