From 737eef3b68e522ae5dfd478292f8f567fcfe311c Mon Sep 17 00:00:00 2001
From: plushmonkey <plushmonkey.ss@gmail.com>
Date: Tue, 7 Aug 2018 22:38:31 -0400
Subject: [PATCH] Fix exceptions from disabled abilities

- Add an extra check to disabled abilities that override core abilities.
  Fixes #24
- Increase version to 2.7.1.
---
 pom.xml                                                      | 2 +-
 src/com/jedk1/jedcore/ability/firebending/Combustion.java    | 2 +-
 src/com/jedk1/jedcore/ability/waterbending/Bloodbending.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d4aefc6..5ca80d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.jedk1</groupId>
   <artifactId>jedcore</artifactId>
-  <version>2.7.0-Spigot1.12.2-PK1.8.7</version>
+  <version>2.7.1-Spigot1.12.2-PK1.8.7</version>
   <packaging>jar</packaging>
   <name>JedCore</name>
 
diff --git a/src/com/jedk1/jedcore/ability/firebending/Combustion.java b/src/com/jedk1/jedcore/ability/firebending/Combustion.java
index 3cb367d..720abbc 100644
--- a/src/com/jedk1/jedcore/ability/firebending/Combustion.java
+++ b/src/com/jedk1/jedcore/ability/firebending/Combustion.java
@@ -41,7 +41,7 @@ public class Combustion extends CombustionAbility implements AddonAbility {
 	public Combustion(Player player) {
 		super(player);
 
-		if (!bPlayer.canBend(this) || !bPlayer.canCombustionbend() || hasAbility(player, Combustion.class)) {
+		if (this.player == null || !bPlayer.canBend(this) || !bPlayer.canCombustionbend() || hasAbility(player, Combustion.class)) {
 			return;
 		}
 
diff --git a/src/com/jedk1/jedcore/ability/waterbending/Bloodbending.java b/src/com/jedk1/jedcore/ability/waterbending/Bloodbending.java
index 4af8474..1689efe 100644
--- a/src/com/jedk1/jedcore/ability/waterbending/Bloodbending.java
+++ b/src/com/jedk1/jedcore/ability/waterbending/Bloodbending.java
@@ -45,7 +45,7 @@ public class Bloodbending extends BloodAbility implements AddonAbility {
 	
 	public Bloodbending(Player player) {
 		super(player);
-		if (!isEligible(player, true)) {
+		if (this.player == null || !isEligible(player, true)) {
 			return;
 		}
 		setFields();