From 18e3a7553ecb04dc03a84696bea17a85a641e546 Mon Sep 17 00:00:00 2001 From: manuelgu Date: Mon, 16 May 2016 04:05:52 +0200 Subject: [PATCH] Fix #1085 Fix #1085 --- .../com/plotsquared/bukkit/listeners/PlayerEvents.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index e5729b814..19d3855e5 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -1072,7 +1072,13 @@ public class PlayerEvents extends PlotListener implements Listener { for (int i = blocks.size() - 1; i >= 0; i--) { location = BukkitUtil.getLocation(blocks.get(i).getLocation()); Plot plot = area.getOwnedPlot(location); - if (!Objects.equals(plot, origin)) { + /* + * plot -> the base plot of the merged area + * origin -> the plot where the event gets called + */ + + // Are plot and origin not the same AND are both plots merged + if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) { event.getBlocks().remove(i); } }