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

Permissions overhaul

Browse source
This commit is contained in:
boy0001 2015-01-13 03:45:50 +11:00
parent f119f6996d
commit f2b5f1d224
24 changed files with 114 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@ public class Merge extends SubCommand {
PlayerFunctions.sendMessage(plr, C.PLOT_UNOWNED);
return false;
}
boolean admin = PlotMain.hasPermission(plr, "plots.admin");
boolean admin = PlotMain.hasPermission(plr, "plots.admin.command.merge");
if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !admin) {
PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
return false;