From 03778e6f31822515a790be92268bd8ad0e160f70 Mon Sep 17 00:00:00 2001
From: "Eli, wyldt-" <JustEli@users.noreply.github.com>
Date: Thu, 30 Jul 2020 06:39:23 +0200
Subject: [PATCH] Check world before performing distance call (#916)

---
 .../java/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java
index eeaf352..d07927b 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java
@@ -53,7 +53,7 @@ class PlayerRescueTask implements Runnable
         playerData.pendingTrapped = false;
 
         //if the player moved three or more blocks from where he used /trapped, admonish him and don't save him
-        if (player.getLocation().distance(this.location) > 3)
+        if (!player.getLocation().getWorld().equals(this.location.getWorld()) || player.getLocation().distance(this.location) > 3)
         {
             GriefPrevention.sendMessage(player, TextMode.Err, Messages.RescueAbortedMoved);
             return;