diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
index 21ee3db05..91f6016b1 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java
@@ -643,35 +643,22 @@ public class Plot {
}
/**
- * Gets a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
+ * Gets an immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
*
* This method cannot be used to add or remove owners from a plot.
*
*
- * @return Immutable view of plot owners
+ * @return Immutable set of plot owners
*/
public @NonNull Set getOwners() {
- if (this.getOwner() == null) {
- return ImmutableSet.of();
- }
- if (isMerged()) {
- Set plots = getConnectedPlots();
- Plot[] array = plots.toArray(new Plot[0]);
- ImmutableSet.Builder owners = ImmutableSet.builder();
- UUID last = this.getOwner();
- owners.add(this.getOwner());
- for (final Plot current : array) {
- if (current.getOwner() == null) {
- continue;
- }
- if (last == null || current.getOwner().getMostSignificantBits() != last.getMostSignificantBits()) {
- owners.add(current.getOwner());
- last = current.getOwner();
- }
+ ImmutableSet.Builder owners = ImmutableSet.builder();
+ for (Plot plot : getConnectedPlots()) {
+ UUID owner = plot.getOwner();
+ if (owner != null) {
+ owners.add(owner);
}
- return owners.build();
}
- return ImmutableSet.of(this.getOwner());
+ return owners.build();
}
/**