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

3.3.2

Browse Source
This commit is contained in:
Jesse Boyd
2016-03-27 03:34:55 +11:00
parent d4d9a9e148
commit 056f77a3ba
7 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ import com.plotsquared.general.commands.CommandDeclaration;
@CommandDeclaration(command = "help",
description = "Get this help menu",
aliases = {"he", "h", "?"},
aliases = {"he", "?"},
category = CommandCategory.INFO,
usage="help [category|#]",
permission="plots.use")
@@ -23,7 +23,7 @@ public class Help extends Command {
}
@Override
public boolean canExecute(PlotPlayer player) {
public boolean canExecute(PlotPlayer player, boolean message) {
return true;
}

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

@@ -240,7 +240,7 @@ public class MainCommand extends Command {
}
@Override
public boolean canExecute(PlotPlayer player) {
public boolean canExecute(PlotPlayer player, boolean message) {
return true;
}
}

2
Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@@ -92,7 +92,7 @@ public class Merge extends SubCommand {
}
}
final PlotArea plotworld = plot.getArea();
final double price = plotworld.PRICES.get("merge");
final double price = plotworld.PRICES.containsKey("merge") ? plotworld.PRICES.get("merge") : 0;
if (EconHandler.manager != null && plotworld.USE_ECONOMY && price > 0d && EconHandler.manager.getMoney(plr) < price) {
sendMessage(plr, C.CANNOT_AFFORD_MERGE, price + "");
return false;