EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-08-04 13:35:27 +02:00
Code Issues Projects Releases Wiki Activity

Fix nested command configuration

Browse Source
This commit is contained in:
Jesse Boyd
2016-03-30 04:47:47 +11:00
parent 560ebf412b
commit bbe43f782c
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@@ -147,7 +147,7 @@ public class MainCommand extends Command {
if (EconHandler.manager != null) {
PlotArea area = player.getApplicablePlotArea();
if (area != null) {
Double price = area.PRICES.get(cmd.getId());
Double price = area.PRICES.get(cmd.getFullId());
if (price != null && EconHandler.manager.getMoney(player) < price) {
failure.run();
return;
@@ -162,7 +162,7 @@ public class MainCommand extends Command {
if (EconHandler.manager != null) {
PlotArea area = player.getApplicablePlotArea();
if (area != null) {
Double price = area.PRICES.get(cmd.getId());
Double price = area.PRICES.get(cmd.getFullId());
if (price != null && EconHandler.manager.getMoney(player) < price) {
failure.run();
return;

8
Core/src/main/java/com/intellectualcrafters/plot/commands/SetCommand.java
View File

@@ -18,15 +18,15 @@ public abstract class SetCommand extends SubCommand {
return !sendMessage(plr, C.NOT_IN_PLOT);
}
if (!plot.hasOwner()) {
if (!Permissions.hasPermission(plr, "plots.admin.command." + getId())) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command." + getId());
if (!Permissions.hasPermission(plr, "plots.admin.command." + getFullId())) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command." + getFullId());
MainUtil.sendMessage(plr, C.PLOT_NOT_CLAIMED);
return false;
}
}
if (!plot.isOwner(plr.getUUID())) {
if (!Permissions.hasPermission(plr, "plots.admin.command." + getId())) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command." + getId());
if (!Permissions.hasPermission(plr, "plots.admin.command." + getFullId())) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command." + getFullId());
MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
return false;
}