Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

feedback

Browse Source
This commit is contained in:
boy0001 2015-01-02 00:28:57 +11:00
parent a6d6c34902
commit b58b6f5963
2 changed files with 3 additions and 2 deletions
Show Stats 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

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

3
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -153,7 +153,7 @@ public enum C {
*/
NO_SCHEMATIC_PERMISSION("&cYou don't have the permission required to use schematic &6%s"),
NO_PERMISSION("&cYou are lacking the permission node: &6%s"),
NO_PLOT_PERMS("&cYou don't have the permissions to do that in this plot"),
NO_PLOT_PERMS("&cYou must be the plot owner to perform this action"),
CANT_CLAIM_MORE_PLOTS("&cYou can't claim more plots."),
CANT_CLAIM_MORE_PLOTS_NUM("&cYou can't claim more than &6%s &cplots at once"),
YOU_BE_DENIED("&cYou are not allowed to enter this plot"),
@ -245,6 +245,7 @@ public enum C {
* Info
*/
PLOT_UNOWNED("&cThe current plot must have an owner to perform this action"),
PLOT_INFO_UNCLAIMED("&cPlot &6%s&c is not yet claimed"),
/*
* PLOT_INFO("" +
* "&6ID&7: &a%id%&7\n" +