From 0f3d6b63f5f10c2813ee5a4cc5c581f5b30ace06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Mon, 18 Jan 2016 23:07:10 +0100 Subject: [PATCH 1/2] I was tired, okay. --- .../com/intellectualcrafters/plot/object/PlotHandler.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java index bc2d48805..128426928 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java +++ b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java @@ -42,11 +42,7 @@ public class PlotHandler { if (!plot.isMerged()) { return false; } - Set plots; - synchronized (Bukkit.getServer()) { - plots = MainUtil.getConnectedPlots(plot); - } - for (Plot current : plots) { + for (Plot current : MainUtil.getConnectedPlots(plot);) { if (current.owner.equals(uuid)) { return true; } From 165d9b625822cb0c375e54edeff699816d97358a Mon Sep 17 00:00:00 2001 From: manuelgu Date: Tue, 19 Jan 2016 14:12:42 +0100 Subject: [PATCH 2/2] Fix #829 --- src/main/java/com/plotsquared/listener/PlotListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/plotsquared/listener/PlotListener.java b/src/main/java/com/plotsquared/listener/PlotListener.java index 999b331bb..109df8bda 100644 --- a/src/main/java/com/plotsquared/listener/PlotListener.java +++ b/src/main/java/com/plotsquared/listener/PlotListener.java @@ -93,7 +93,7 @@ public class PlotListener { for (final UUID uuid : PlotHandler.getOwners(plot)) { final PlotPlayer owner = UUIDHandler.getPlayer(uuid); if ((owner != null) && !owner.getUUID().equals(pp.getUUID())) { - MainUtil.sendMessage(pp, C.NOTIFY_ENTER.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString())); + MainUtil.sendMessage(owner, C.NOTIFY_ENTER.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString())); } } }