EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Check plot ownership/event before handling Direction.ALL

Browse Source
This commit is contained in:
dordsor21 2021-07-17 17:51:48 +01:00
parent 2e64ac6d25
commit 31522b6502
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/src/main/java/com/plotsquared/core/command/Merge.java
View File

@ -157,6 +157,15 @@ public class Merge extends SubCommand {
final double price = priceExr == null ? 0d : priceExr.evaluate(size); final double price = priceExr == null ? 0d : priceExr.evaluate(size);
UUID uuid = player.getUUID(); UUID uuid = player.getUUID();
if (!force && !plot.isOwner(uuid)) {
if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
} else {
uuid = plot.getOwnerAbs();
}
}
if (direction == Direction.ALL) { if (direction == Direction.ALL) {
boolean terrain = true; boolean terrain = true;
if (args.length == 2) { if (args.length == 2) {
@ -185,14 +194,6 @@ public class Merge extends SubCommand {
player.sendMessage(TranslatableCaption.of("merge.no_available_automerge")); player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
return false; return false;
} }
if (!force && !plot.isOwner(uuid)) {
if (!Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_COMMAND_MERGE)) {
player.sendMessage(TranslatableCaption.of("permission.no_plot_perms"));
return false;
} else {
uuid = plot.getOwnerAbs();
}
}
if (!force && this.econHandler.isEnabled(plotArea) && price > 0d if (!force && this.econHandler.isEnabled(plotArea) && price > 0d
&& this.econHandler.getMoney(player) < price) { && this.econHandler.getMoney(player) < price) {
player.sendMessage( player.sendMessage(