502647092/Residence
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-25 21:56:06 +00:00
Code Releases Activity

fix res market command...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092
2015-10-14 20:46:46 +08:00
parent ce8c8fbd66
commit 7033a88063
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/com/bekvon/bukkit/residence/commandsub/CommandMarket.java
View File

@@ -71,27 +71,27 @@ public class CommandMarket extends BaseCommand {
} }
if (cmd.equals("release")) { if (cmd.equals("release")) {
if (args.length != 3) { if (args.length != 2) {
return; return;
} }
if (rentmanager.isRented(args[2])) { if (rentmanager.isRented(args[1])) {
rentmanager.removeFromForRent(player, args[2], resadmin); rentmanager.removeFromForRent(player, args[1], resadmin);
} else { } else {
rentmanager.unrent(player, args[2], resadmin); rentmanager.unrent(player, args[1], resadmin);
} }
return; return;
} }
if (cmd.equals("info")) { if (cmd.equals("info")) {
if (args.length == 2) { if (args.length == 1) {
final String areaname = rmanager.getNameByLoc(player.getLocation()); final String areaname = rmanager.getNameByLoc(player.getLocation());
tmanager.viewSaleInfo(areaname, player); tmanager.viewSaleInfo(areaname, player);
if (cmanager.enabledRentSystem() && rentmanager.isForRent(areaname)) { if (cmanager.enabledRentSystem() && rentmanager.isForRent(areaname)) {
rentmanager.printRentInfo(player, areaname); rentmanager.printRentInfo(player, areaname);
} }
} else if (args.length == 3) { } else if (args.length == 2) {
tmanager.viewSaleInfo(args[2], player); tmanager.viewSaleInfo(args[1], player);
if (cmanager.enabledRentSystem() && rentmanager.isForRent(args[2])) { if (cmanager.enabledRentSystem() && rentmanager.isForRent(args[1])) {
rentmanager.printRentInfo(player, args[2]); rentmanager.printRentInfo(player, args[1]);
} }
} else { } else {
return; return;
@@ -99,31 +99,31 @@ public class CommandMarket extends BaseCommand {
return; return;
} }
if (cmd.equals("buy")) { if (cmd.equals("buy")) {
if (args.length != 3) { if (args.length != 2) {
return; return;
} }
tmanager.buyPlot(args[2], player, resadmin); tmanager.buyPlot(args[1], player, resadmin);
return; return;
} }
if (cmd.equals("unsell")) { if (cmd.equals("unsell")) {
if (args.length != 3) { if (args.length != 2) {
return; return;
} }
tmanager.removeFromSale(player, args[2], resadmin); tmanager.removeFromSale(player, args[1], resadmin);
return; return;
} }
if (cmd.equals("sell")) { if (cmd.equals("sell")) {
if (args.length != 4) { if (args.length != 3) {
return; return;
} }
int amount; int amount;
try { try {
amount = Integer.parseInt(args[3]); amount = Integer.parseInt(args[2]);
} catch (final Exception ex) { } catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidAmount")); player.sendMessage(ChatColor.RED + language.getPhrase("InvalidAmount"));
return; return;
} }
tmanager.putForSale(args[2], player, amount, resadmin); tmanager.putForSale(args[1], player, amount, resadmin);
return; return;
} }
} }
@@ -133,24 +133,24 @@ public class CommandMarket extends BaseCommand {
player.sendMessage(ChatColor.RED + language.getPhrase("MarketDisabled")); player.sendMessage(ChatColor.RED + language.getPhrase("MarketDisabled"));
return true; return true;
} }
if (args.length != 4) { if (args.length != 3) {
return true; return true;
} }
boolean value; boolean value;
if (args[3].equalsIgnoreCase("true") || args[3].equalsIgnoreCase("t")) { if (args[2].equalsIgnoreCase("true") || args[2].equalsIgnoreCase("t")) {
value = true; value = true;
} else if (args[3].equalsIgnoreCase("false") || args[3].equalsIgnoreCase("f")) { } else if (args[2].equalsIgnoreCase("false") || args[2].equalsIgnoreCase("f")) {
value = false; value = false;
} else { } else {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidBoolean")); player.sendMessage(ChatColor.RED + language.getPhrase("InvalidBoolean"));
return true; return true;
} }
if (rentmanager.isRented(args[2]) && rentmanager.getRentingPlayer(args[2]).equalsIgnoreCase(player.getName())) { if (rentmanager.isRented(args[1]) && rentmanager.getRentingPlayer(args[1]).equalsIgnoreCase(player.getName())) {
rentmanager.setRentedRepeatable(player, args[2], value, resadmin); rentmanager.setRentedRepeatable(player, args[1], value, resadmin);
} else if (rentmanager.isForRent(args[2])) { } else if (rentmanager.isForRent(args[1])) {
rentmanager.setRentRepeatable(player, args[2], value, resadmin); rentmanager.setRentRepeatable(player, args[1], value, resadmin);
} else { } else {
player.sendMessage(ChatColor.RED + language.getPhrase("RentReleaseInvalid", ChatColor.YELLOW + args[2] + ChatColor.RED)); player.sendMessage(ChatColor.RED + language.getPhrase("RentReleaseInvalid", ChatColor.YELLOW + args[1] + ChatColor.RED));
} }
return true; return true;
} }
@@ -169,24 +169,24 @@ public class CommandMarket extends BaseCommand {
} }
private boolean commandResMarketRent(final String[] args, final boolean resadmin, final Player player, final int page) { private boolean commandResMarketRent(final String[] args, final boolean resadmin, final Player player, final int page) {
if (args.length < 3 || args.length > 4) { if (args.length < 2 || args.length > 3) {
return false; return false;
} }
boolean repeat = false; boolean repeat = false;
if (args.length == 4) { if (args.length == 3) {
if (args[3].equalsIgnoreCase("t") || args[3].equalsIgnoreCase("true")) { if (args[2].equalsIgnoreCase("t") || args[2].equalsIgnoreCase("true")) {
repeat = true; repeat = true;
} else if (!args[3].equalsIgnoreCase("f") && !args[3].equalsIgnoreCase("false")) { } else if (!args[2].equalsIgnoreCase("f") && !args[2].equalsIgnoreCase("false")) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidBoolean")); player.sendMessage(ChatColor.RED + language.getPhrase("InvalidBoolean"));
return true; return true;
} }
} }
rentmanager.rent(player, args[2], repeat, resadmin); rentmanager.rent(player, args[1], repeat, resadmin);
return true; return true;
} }
private boolean commandResMarketRentable(final String[] args, final boolean resadmin, final Player player, final int page) { private boolean commandResMarketRentable(final String[] args, final boolean resadmin, final Player player, final int page) {
if (args.length < 5 || args.length > 6) { if (args.length < 4 || args.length > 5) {
return false; return false;
} }
if (!cmanager.enabledRentSystem()) { if (!cmanager.enabledRentSystem()) {
@@ -196,27 +196,28 @@ public class CommandMarket extends BaseCommand {
int days; int days;
int cost; int cost;
try { try {
cost = Integer.parseInt(args[3]); cost = Integer.parseInt(args[2]);
} catch (final Exception ex) { } catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidCost")); player.sendMessage(ChatColor.RED + language.getPhrase("InvalidCost"));
return true; return true;
} }
try { try {
days = Integer.parseInt(args[4]); days = Integer.parseInt(args[3]);
} catch (final Exception ex) { } catch (final Exception ex) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidDays")); player.sendMessage(ChatColor.RED + language.getPhrase("InvalidDays"));
return true; return true;
} }
boolean repeat = false; boolean repeat = false;
if (args.length == 6) { if (args.length == 5) {
if (args[5].equalsIgnoreCase("t") || args[5].equalsIgnoreCase("true")) { final String state = args[4];
if (state.equalsIgnoreCase("t") || state.equalsIgnoreCase("true")) {
repeat = true; repeat = true;
} else if (!args[5].equalsIgnoreCase("f") && !args[5].equalsIgnoreCase("false")) { } else if (!state.equalsIgnoreCase("f") && !state.equalsIgnoreCase("false")) {
player.sendMessage(ChatColor.RED + language.getPhrase("InvalidBoolean")); player.sendMessage(ChatColor.RED + language.getPhrase("InvalidBoolean"));
return true; return true;
} }
} }
rentmanager.setForRent(player, args[2], cost, days, repeat, resadmin); rentmanager.setForRent(player, args[1], cost, days, repeat, resadmin);
return true; return true;
} }