From 0988ef73111d3519c3af16187a4475b45341ba45 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sun, 26 Jul 2015 15:14:01 +1000 Subject: [PATCH] Tweak --- .../plot/object/PlotHandler.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java index 044330086..bf4473420 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java +++ b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java @@ -93,6 +93,16 @@ public class PlotHandler { return true; } } - return PlotHandler.isOwner(plot, uuid); + if (plot.isMerged()) { + Plot top = MainUtil.getTopPlot(plot); + ArrayList ids = MainUtil.getPlotSelectionIds(plot.id, top.id); + for (PlotId id : ids) { + UUID owner = MainUtil.getPlot(plot.world, id).owner; + if (owner != null && owner.equals(uuid)) { + return true; + } + } + } + return false; } }