From e9827fd499cf829d657c4b261b0657e6e7c286f1 Mon Sep 17 00:00:00 2001
From: Jack Lin <jacklin213@gmail.com>
Date: Mon, 16 Feb 2015 18:26:49 +1300
Subject: [PATCH] Add world checks FireShield

---
 .../ProjectKorra/firebending/FireShield.java             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireShield.java b/src/com/projectkorra/ProjectKorra/firebending/FireShield.java
index 1f28a101..df27c954 100644
--- a/src/com/projectkorra/ProjectKorra/firebending/FireShield.java
+++ b/src/com/projectkorra/ProjectKorra/firebending/FireShield.java
@@ -185,12 +185,15 @@ public class FireShield {
 			FireShield fshield = instances.get(player);
 			Location playerLoc = fshield.player.getLocation();
 
-			if(fshield.shield){
+			if(fshield.shield) {
+				if (playerLoc.getWorld() != loc.getWorld())
+					return false;
 				if(playerLoc.distance(loc) <= fshield.radius)
 					return true;
-			}
-			else{
+			} else {
 				Location tempLoc = playerLoc.clone().add(playerLoc.multiply(fshield.discradius));
+				if (playerLoc.getWorld() != tempLoc.getWorld()) 
+					return false;
 				if(tempLoc.distance(loc) <= fshield.discradius)
 					return true;
 			}