From 0fae90638536f2a677ffc56442ae575b4af97c4b Mon Sep 17 00:00:00 2001
From: OmniCypher <OmniCypher@yahoo.com>
Date: Sat, 7 Nov 2015 16:16:46 -0800
Subject: [PATCH] Fixes

Fixes Waterwave crash
Fixes Debug permission message
Fixes Bind toggling message
Fixes BendingPlayer isElementToggled NPE
---
 src/com/projectkorra/projectkorra/BendingPlayer.java       | 4 +++-
 src/com/projectkorra/projectkorra/command/BindCommand.java | 7 +++----
 .../projectkorra/projectkorra/command/DebugCommand.java    | 6 +++---
 .../projectkorra/projectkorra/waterbending/WaterWave.java  | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/BendingPlayer.java b/src/com/projectkorra/projectkorra/BendingPlayer.java
index b967bbc2..a0eb9dfc 100644
--- a/src/com/projectkorra/projectkorra/BendingPlayer.java
+++ b/src/com/projectkorra/projectkorra/BendingPlayer.java
@@ -203,7 +203,9 @@ public class BendingPlayer {
 	}
 	
 	public boolean isElementToggled(Element e) {
-		return this.toggledElements.get(e);
+		if(e != null)
+			return this.toggledElements.get(e);
+		return true;
 	}
 
 	/**
diff --git a/src/com/projectkorra/projectkorra/command/BindCommand.java b/src/com/projectkorra/projectkorra/command/BindCommand.java
index f6f23929..237dbabd 100644
--- a/src/com/projectkorra/projectkorra/command/BindCommand.java
+++ b/src/com/projectkorra/projectkorra/command/BindCommand.java
@@ -28,10 +28,6 @@ public class BindCommand extends PKCommand {
 			return;
 		}
 		
-		if (GeneralMethods.getBendingPlayer(sender.getName()).isElementToggled(GeneralMethods.getAbilityElement(args.get(0))) == false) {
-			sender.sendMessage(ChatColor.RED + "You have that ability's element toggled off currently.");
-		}
-		
 		String ability = GeneralMethods.getAbility(args.get(0));
 		// bending bind [Ability]
 		if (args.size() == 1) {
@@ -53,7 +49,10 @@ public class BindCommand extends PKCommand {
 		if (!GeneralMethods.canBind(((Player) sender).getName(), ability)) {
 			sender.sendMessage(ChatColor.RED + "You don't have permission to bend this element.");
 			return;
+		} else if (!GeneralMethods.getBendingPlayer(sender.getName()).isElementToggled(GeneralMethods.getAbilityElement(ability))) {
+			sender.sendMessage(ChatColor.RED + "You have that ability's element toggled off currently.");
 		}
+		
 		GeneralMethods.bindAbility((Player) sender, GeneralMethods.getAbility(ability), slot);
 	}
 }
diff --git a/src/com/projectkorra/projectkorra/command/DebugCommand.java b/src/com/projectkorra/projectkorra/command/DebugCommand.java
index f5197353..6c060539 100644
--- a/src/com/projectkorra/projectkorra/command/DebugCommand.java
+++ b/src/com/projectkorra/projectkorra/command/DebugCommand.java
@@ -38,10 +38,10 @@ public class DebugCommand extends PKCommand {
 	 */
 	@Override
 	public boolean hasPermission(CommandSender sender) {
-		if (sender.hasPermission("bending.admin." + getName())) {
+		if (!sender.hasPermission("bending.admin." + getName())) {
 			sender.sendMessage(ChatColor.RED + "You don't have permission to use this command.");
-			return true;
+			return false;
 		}
-		return false;
+		return true;
 	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterWave.java b/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
index 338e39c3..d0a949ab 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
@@ -82,7 +82,7 @@ public class WaterWave {
 
 	public void progress() {
 		progressCounter++;
-		if (player.isDead() || !player.isOnline() || !origin.getWorld().equals(player.getWorld())) {
+		if (player.isDead() || !player.isOnline()) {
 			remove();
 			return;
 		}