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; } 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())); } } }