Skip to content

Commit 737eef3

Browse files
committed
Fix exceptions from disabled abilities
- Add an extra check to disabled abilities that override core abilities. Fixes #24 - Increase version to 2.7.1.
1 parent f71ba85 commit 737eef3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.jedk1</groupId>
66
<artifactId>jedcore</artifactId>
7-
<version>2.7.0-Spigot1.12.2-PK1.8.7</version>
7+
<version>2.7.1-Spigot1.12.2-PK1.8.7</version>
88
<packaging>jar</packaging>
99
<name>JedCore</name>
1010

src/com/jedk1/jedcore/ability/firebending/Combustion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class Combustion extends CombustionAbility implements AddonAbility {
4141
public Combustion(Player player) {
4242
super(player);
4343

44-
if (!bPlayer.canBend(this) || !bPlayer.canCombustionbend() || hasAbility(player, Combustion.class)) {
44+
if (this.player == null || !bPlayer.canBend(this) || !bPlayer.canCombustionbend() || hasAbility(player, Combustion.class)) {
4545
return;
4646
}
4747

src/com/jedk1/jedcore/ability/waterbending/Bloodbending.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class Bloodbending extends BloodAbility implements AddonAbility {
4545

4646
public Bloodbending(Player player) {
4747
super(player);
48-
if (!isEligible(player, true)) {
48+
if (this.player == null || !isEligible(player, true)) {
4949
return;
5050
}
5151
setFields();

0 commit comments

Comments
 (0)