From 2ac3667437289368fd54e27c1fa858ad137d1f96 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sat, 13 Aug 2016 22:13:42 -0500 Subject: [PATCH] Fix Party distance measuring worlds. --- TwosideKeeper.jar | Bin 481295 -> 481334 bytes .../plugin/TwosideKeeper/PartyManager.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 8e2f8a1662638d43ee0c409ed0b77ab1a68e120f..307a24fc4b87bdbf09be123e89788586ddff1500 100644 GIT binary patch delta 5324 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 F{{V+Fx*`Ao delta 5270 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 IgoE?^4~bx3r~m)} diff --git a/src/sig/plugin/TwosideKeeper/PartyManager.java b/src/sig/plugin/TwosideKeeper/PartyManager.java index 8cf6617..5ac1b2a 100644 --- a/src/sig/plugin/TwosideKeeper/PartyManager.java +++ b/src/sig/plugin/TwosideKeeper/PartyManager.java @@ -178,7 +178,7 @@ public class PartyManager { private static void AddNearbyPlayersToSameParty(Player sourcep) { for (Player checkp : Bukkit.getOnlinePlayers()) { - if (!IsInParty(checkp) && sourcep.getLocation().distanceSquared(checkp.getLocation())<=Math.pow(TwosideKeeper.PARTY_CHUNK_SIZE,2)) { + if (!IsInParty(checkp) && checkp.getWorld().equals(sourcep.getWorld()) && sourcep.getLocation().distanceSquared(checkp.getLocation())<=Math.pow(TwosideKeeper.PARTY_CHUNK_SIZE,2)) { AddPlayerToParty(checkp,GetCurrentParty(sourcep)); AddNearbyPlayersToSameParty(checkp); }