cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few things, remove bad code

Browse Source
This commit is contained in:
gomeow
2013-08-27 11:21:42 -07:00
parent 357e0c6142
commit 2ba9656f48
7 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/commands/Commands.java
+2 -2
View File
@@ -63,7 +63,7 @@ public class Commands implements CommandExecutor {
if (sender.hasPermission("playervaults.signs.set")) {
if (sender instanceof Player) {
if (args.length == 1) {
int i = 0;
int i;
try {
i = Integer.parseInt(args[0]);
} catch (NumberFormatException nfe) {
@@ -74,7 +74,7 @@ public class Commands implements CommandExecutor {
PlayerVaults.SET_SIGN.put(sender.getName(), new SignSetInfo(i));
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
} else if (args.length >= 2) {
int i = 0;
int i;
try {
i = Integer.parseInt(args[1]);
} catch (NumberFormatException nfe) {
src/main/java/com/drtshock/playervaults/commands/VaultOperations.java
+12 -14
View File
@@ -35,7 +35,7 @@ public class VaultOperations {
*/
public static boolean openOwnVault(Player player, String arg) {
if (arg.matches("^[0-9]{1,2}$")) {
int number = 0;
int number;
try {
number = Integer.parseInt(arg);
if (number == 0)
@@ -45,9 +45,9 @@ public class VaultOperations {
return false;
}
if (checkPerms(player, number)) {
if (EconomyOperations.payToOpen(player)) {
if (EconomyOperations.payToOpen(player, number)) {
PlayerVaults.log.info(String.valueOf(player.hasPermission("playervaults.small")));
Inventory inv = PlayerVaults.VM.loadVault(player.getName(), number, !player.hasPermission("playervaults.small"));
Inventory inv = PlayerVaults.VM.loadVault(player.getName(), number);
player.openInventory(inv);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
return true;
@@ -82,7 +82,7 @@ public class VaultOperations {
} catch (NumberFormatException nfe) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
Inventory inv = PlayerVaults.VM.loadVault(holder, number, true);
Inventory inv = PlayerVaults.VM.loadVault(holder, number);
player.openInventory(inv);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", holder));
return true;
@@ -98,7 +98,6 @@ public class VaultOperations {
/**
* Delete a player's own vault.
* @param player The player to delete.
* @param user The user to whom the deleted vault belongs.
* @param arg The vault number to delete.
*/
public static void deleteOwnVault(Player player, String arg) {
@@ -115,7 +114,6 @@ public class VaultOperations {
try {
if (EconomyOperations.refundOnDelete(player, number)) {
PlayerVaults.VM.deleteVault(player, player.getName(), number);
return;
}
} catch (IOException e) {
player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
@@ -131,29 +129,29 @@ public class VaultOperations {
* @param holder The user to whom the deleted vault belongs.
* @param arg The vault number to delete.
*/
public static void deleteOtherVault(CommandSender sender, String holder, String arg) {
if (sender.hasPermission("playervaults.delete")) {
public static void deleteOtherVault(CommandSender player, String holder, String arg) {
if (player.hasPermission("playervaults.delete")) {
if (arg.matches("^[0-9]{1,2}$")) {
int number = 0;
try {
number = Integer.parseInt(arg);
if (number == 0) {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
return;
}
} catch (NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
try {
PlayerVaults.VM.deleteVault(sender, holder, number);
PlayerVaults.VM.deleteVault(player, holder, number);
} catch (IOException e) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
}
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
}
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
}
}