Merge pull request #497 from StrangeOne101/master

Bug fixes

src/com/projectkorra/projectkorra/PKListener.java

@@ -389,7 +389,8 @@ public class PKListener implements Listener {
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
 		Block block = event.getDamager();
-
+		if (block == null) return;
+		
 		if (TempBlock.isTempBlock(block)) {
 			if (EarthAbility.isEarthbendable(block.getType()) && GeneralMethods.isSolid(block)) {
 				event.setCancelled(true);

src/com/projectkorra/projectkorra/firebending/FireBlast.java

@@ -3,6 +3,7 @@ package com.projectkorra.projectkorra.firebending;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.AirAbility;
+import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.avatar.AvatarState;
@@ -164,6 +165,14 @@ public class FireBlast extends FireAbility {
 			return;
 		}
 		
+		if (isFireBurst && !bPlayer.canBend(CoreAbility.getAbility("FireBurst"))) {
+			remove();
+			return;
+		} else if (!isFireBurst && !bPlayer.canBend(CoreAbility.getAbility("FireBlast"))) {
+			remove();
+			return;
+		} 
+		
 		speedFactor = speed * (ProjectKorra.time_step / 1000.0);
 		ticks++;
 

src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java

@@ -2,6 +2,7 @@ package com.projectkorra.projectkorra.firebending;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.AirAbility;
+import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -233,7 +234,11 @@ public class FireBlastCharged extends FireAbility {
 		if (!bPlayer.canBendIgnoreBindsCooldowns(this) && !launched) {
 			remove();
 			return;
-		} else if (!player.isSneaking() && !charged) {
+		} else if (!bPlayer.canBend(CoreAbility.getAbility("FireBlast")) && !launched) {
+			remove();
+			return;
+		}
+		else if (!player.isSneaking() && !charged) {
 			remove();
 			return;
 		}

src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java

@@ -151,6 +151,7 @@ public class WaterArmsSpear extends WaterAbility {
 			progressSpear();
 		} else {
 			createIceBall();
+			remove();
 		}
 		
 		if (layer >= spearSphere) {