TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-10 06:23:14 +00:00
Code Issues Projects Releases Wiki Activity

Schematic export + Administrator plot merging

Browse source
This commit is contained in:
boy0001 2015-01-02 00:22:59 +11:00
parent 7a558b34da
commit a6d6c34902
6 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View file

@ -83,10 +83,11 @@ public class Merge extends SubCommand {
}
final Plot plot = PlayerFunctions.getCurrentPlot(plr);
if ((plot == null) || !plot.hasOwner()) {
PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
PlayerFunctions.sendMessage(plr, C.PLOT_UNOWNED);
return false;
}
if (!plot.getOwner().equals(UUIDHandler.getUUID(plr))) {
boolean admin = PlotMain.hasPermission(plr, "plots.admin");
if (!plot.getOwner().equals(UUIDHandler.getUUID( plr)) && !admin) {
PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
return false;
}
@ -129,7 +130,7 @@ public class Merge extends SubCommand {
}
for (final PlotId myid : plots) {
final Plot myplot = PlotMain.getPlots(world).get(myid);
if ((myplot == null) || !myplot.hasOwner() || !(myplot.getOwner().equals(UUIDHandler.getUUID(plr)))) {
if ((myplot == null) || !myplot.hasOwner() || !(myplot.getOwner().equals(UUIDHandler.getUUID(plr)) || admin)) {
PlayerFunctions.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
return false;
}
@ -161,7 +162,7 @@ public class Merge extends SubCommand {
PlayerFunctions.sendMessage(plr, "&cPlots have been merged");
PlotHelper.mergePlots(world, plots);
PlotHelper.setSign(world, plr.getName(), plot);
PlotHelper.setSign(world, UUIDHandler.getName(plot.owner), plot);
if (PlotHelper.canSetFast) {
SetBlockFast.update(plr);