From 3287e891c1d016da3fe206d7d43a59b3bdb73112 Mon Sep 17 00:00:00 2001
From: OmniCypher <OmniCypher@yahoo.com>
Date: Wed, 18 Nov 2015 16:01:12 -0800
Subject: [PATCH] WaterWave NPE Fix

Fixes WaterWave origin NPE.
---
 src/com/projectkorra/projectkorra/waterbending/WaterWave.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterWave.java b/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
index d0a949ab..d2bd5963 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
@@ -86,6 +86,10 @@ public class WaterWave {
 			remove();
 			return;
 		}
+		if (origin != null && !player.getWorld().equals(origin.getWorld())) {
+			remove();
+			return;
+		}
 		if (type != AbilityType.RELEASE) {
 			if (!GeneralMethods.canBend(player.getName(), "WaterSpout") || !player.hasPermission("bending.ability.WaterSpout.Wave")) {
 				remove();