mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-22 11:55:38 +01:00
Revert "Replace getOwnerAbs() == null
with hasOwner()
"
This reverts commit 79620042
This commit is contained in:
parent
c2060ea1a7
commit
172bcc7677
@ -487,7 +487,7 @@ public class Plot {
|
|||||||
* @return true if the player is added/trusted or is the owner
|
* @return true if the player is added/trusted or is the owner
|
||||||
*/
|
*/
|
||||||
public boolean isAdded(UUID uuid) {
|
public boolean isAdded(UUID uuid) {
|
||||||
if (this.hasOwner() || getDenied().contains(uuid)) {
|
if (this.getOwnerAbs() == null || getDenied().contains(uuid)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (isOwner(uuid)) {
|
if (isOwner(uuid)) {
|
||||||
@ -911,7 +911,7 @@ public class Plot {
|
|||||||
TaskManager.runTask(whenDone);
|
TaskManager.runTask(whenDone);
|
||||||
};
|
};
|
||||||
for (Plot current : plots) {
|
for (Plot current : plots) {
|
||||||
if (isDelete || current.hasOwner()) {
|
if (isDelete || current.getOwnerAbs() == null) {
|
||||||
manager.unClaimPlot(current, null);
|
manager.unClaimPlot(current, null);
|
||||||
} else {
|
} else {
|
||||||
manager.claimPlot(current);
|
manager.claimPlot(current);
|
||||||
@ -1313,7 +1313,7 @@ public class Plot {
|
|||||||
* @return false if the Plot has no owner, otherwise true.
|
* @return false if the Plot has no owner, otherwise true.
|
||||||
*/
|
*/
|
||||||
public boolean unclaim() {
|
public boolean unclaim() {
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (Plot current : getConnectedPlots()) {
|
for (Plot current : getConnectedPlots()) {
|
||||||
@ -1698,7 +1698,7 @@ public class Plot {
|
|||||||
* Sets the plot sign if plot signs are enabled.
|
* Sets the plot sign if plot signs are enabled.
|
||||||
*/
|
*/
|
||||||
public void setSign() {
|
public void setSign() {
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
this.setSign("unknown");
|
this.setSign("unknown");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1892,7 +1892,7 @@ public class Plot {
|
|||||||
* @return Future containing the result
|
* @return Future containing the result
|
||||||
*/
|
*/
|
||||||
public CompletableFuture<Boolean> swapData(Plot plot) {
|
public CompletableFuture<Boolean> swapData(Plot plot) {
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
if (plot != null && plot.hasOwner()) {
|
if (plot != null && plot.hasOwner()) {
|
||||||
plot.moveData(this, null);
|
plot.moveData(this, null);
|
||||||
return CompletableFuture.completedFuture(true);
|
return CompletableFuture.completedFuture(true);
|
||||||
@ -1927,7 +1927,7 @@ public class Plot {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public boolean moveData(Plot plot, Runnable whenDone) {
|
public boolean moveData(Plot plot, Runnable whenDone) {
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
PlotSquared.debug(plot + " is unowned (single)");
|
PlotSquared.debug(plot + " is unowned (single)");
|
||||||
TaskManager.runTask(whenDone);
|
TaskManager.runTask(whenDone);
|
||||||
return false;
|
return false;
|
||||||
@ -2480,7 +2480,7 @@ public class Plot {
|
|||||||
*/
|
*/
|
||||||
public boolean autoMerge(Direction dir, int max, UUID uuid, boolean removeRoads) {
|
public boolean autoMerge(Direction dir, int max, UUID uuid, boolean removeRoads) {
|
||||||
//Ignore merging if there is no owner for the plot
|
//Ignore merging if there is no owner for the plot
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Set<Plot> connected = this.getConnectedPlots();
|
Set<Plot> connected = this.getConnectedPlots();
|
||||||
@ -2780,7 +2780,7 @@ public class Plot {
|
|||||||
}
|
}
|
||||||
Plot current;
|
Plot current;
|
||||||
while ((current = frontier.poll()) != null) {
|
while ((current = frontier.poll()) != null) {
|
||||||
if (current.hasOwner() || current.settings == null) {
|
if (current.getOwnerAbs() == null || current.settings == null) {
|
||||||
// Invalid plot
|
// Invalid plot
|
||||||
// merged onto unclaimed plot
|
// merged onto unclaimed plot
|
||||||
PlotSquared.debug(
|
PlotSquared.debug(
|
||||||
@ -3088,7 +3088,7 @@ public class Plot {
|
|||||||
* @return true if the owner of the Plot is online
|
* @return true if the owner of the Plot is online
|
||||||
*/
|
*/
|
||||||
public boolean isOnline() {
|
public boolean isOnline() {
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!isMerged()) {
|
if (!isMerged()) {
|
||||||
@ -3219,7 +3219,7 @@ public class Plot {
|
|||||||
Location ob = this.getBottomAbs();
|
Location ob = this.getBottomAbs();
|
||||||
final int offsetX = db.getX() - ob.getX();
|
final int offsetX = db.getX() - ob.getX();
|
||||||
final int offsetZ = db.getZ() - ob.getZ();
|
final int offsetZ = db.getZ() - ob.getZ();
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
TaskManager.runTaskLater(whenDone, 1);
|
TaskManager.runTaskLater(whenDone, 1);
|
||||||
return CompletableFuture.completedFuture(false);
|
return CompletableFuture.completedFuture(false);
|
||||||
}
|
}
|
||||||
@ -3338,7 +3338,7 @@ public class Plot {
|
|||||||
Location ob = this.getBottomAbs();
|
Location ob = this.getBottomAbs();
|
||||||
final int offsetX = db.getX() - ob.getX();
|
final int offsetX = db.getX() - ob.getX();
|
||||||
final int offsetZ = db.getZ() - ob.getZ();
|
final int offsetZ = db.getZ() - ob.getZ();
|
||||||
if (this.hasOwner()) {
|
if (this.getOwnerAbs() == null) {
|
||||||
TaskManager.runTaskLater(whenDone, 1);
|
TaskManager.runTaskLater(whenDone, 1);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ import java.util.UUID;
|
|||||||
public class PlotHandler {
|
public class PlotHandler {
|
||||||
|
|
||||||
public static boolean sameOwners(@NotNull final Plot plot1, @NotNull final Plot plot2) {
|
public static boolean sameOwners(@NotNull final Plot plot1, @NotNull final Plot plot2) {
|
||||||
if (plot1.hasOwner() || plot2.hasOwner()) {
|
if (plot1.getOwnerAbs() == null || plot2.getOwnerAbs() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final Set<UUID> owners = plot1.getOwners();
|
final Set<UUID> owners = plot1.getOwners();
|
||||||
|
Loading…
Reference in New Issue
Block a user