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

Format some stuffs

Browse Source
This commit is contained in:
gomeow
2013-08-25 14:58:11 -07:00
parent f484a8eb71
commit e527764d56
10 changed files with 236 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/commands/Commands.java
+27 -30
View File
@@ -17,37 +17,35 @@ public class Commands implements CommandExecutor {
if (sender instanceof Player) {
Player p = (Player) sender;
switch (args.length) {
case 1:
if (VaultOperations.openOwnVault(p, args[0]))
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
break;
case 2:
if (VaultOperations.openOtherVault(p, args[0], args[1]))
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
break;
default:
sender.sendMessage(Lang.TITLE + "/pv <number>");
sender.sendMessage(Lang.TITLE + "/pv <player> <number>");
case 1:
if (VaultOperations.openOwnVault(p, args[0]))
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
break;
case 2:
if (VaultOperations.openOtherVault(p, args[0], args[1]))
PlayerVaults.IN_VAULT.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
break;
default:
sender.sendMessage(Lang.TITLE + "/pv <number>");
sender.sendMessage(Lang.TITLE + "/pv <player> <number>");
}
}
else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
} else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
} else if (cmd.getName().equalsIgnoreCase("pvdel")) {
switch (args.length) {
case 1:
if (sender instanceof Player) {
Player p = (Player) sender;
VaultOperations.deleteOwnVault(p, args[0]);
}
else {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
}
break;
case 2:
VaultOperations.deleteOtherVault(sender, args[0], args[1]);
break;
default:
sender.sendMessage(Lang.TITLE + "/pvdel <number>");
sender.sendMessage(Lang.TITLE + "/pvdel <player> <number>");
case 1:
if (sender instanceof Player) {
Player p = (Player) sender;
VaultOperations.deleteOwnVault(p, args[0]);
} else {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
}
break;
case 2:
VaultOperations.deleteOtherVault(sender, args[0], args[1]);
break;
default:
sender.sendMessage(Lang.TITLE + "/pvdel <number>");
sender.sendMessage(Lang.TITLE + "/pvdel <player> <number>");
}
} else if (cmd.getName().equalsIgnoreCase("workbench")) {
if (sender.hasPermission("playervaults.workbench")) {
@@ -75,8 +73,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) {
} else if (args.length >= 2) {
int i = 0;
try {
i = Integer.parseInt(args[1]);
src/main/java/com/drtshock/playervaults/util/EconomyOperations.java
+1 -2
View File
@@ -85,8 +85,7 @@ public class EconomyOperations {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
return false;
}
}
else {
} else {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.VAULT_DOES_NOT_EXIST);
return false;
}
src/main/java/com/drtshock/playervaults/util/Metrics.java
+4 -2
View File
@@ -561,7 +561,8 @@ public class Metrics {
/**
* Called when the server owner decides to opt-out of Metrics while the server is running.
*/
protected void onOptOut() {}
protected void onOptOut() {
}
}
@@ -613,7 +614,8 @@ public class Metrics {
/**
* Called after the website graphs have been updated
*/
public void reset() {}
public void reset() {
}
@Override
public int hashCode() {
src/main/java/com/drtshock/playervaults/util/Serialization.java
+2 -4
View File
@@ -64,8 +64,7 @@ public class Serialization {
for (ConfigurationSerializable cs : items) {
if (cs == null) {
result.add("null");
}
else {
} else {
result.add(new JSONObject(serialize(cs)).toString());
}
}
@@ -80,8 +79,7 @@ public class Serialization {
for (String piece : stringItems) {
if (piece.equalsIgnoreCase("null")) {
contents.add(null);
}
else {
} else {
try {
ItemStack item = (ItemStack) deserialize(toMap(new JSONObject(piece)));
contents.add(item);
src/main/java/com/drtshock/playervaults/util/VaultHolder.java
+3 -3
View File
@@ -14,7 +14,7 @@ public class VaultHolder implements InventoryHolder {
/**
* Creates a new vault holder
*
*
* @param vaultNumber the vault number this holder is using
*/
public VaultHolder(int vaultNumber) {
@@ -23,7 +23,7 @@ public class VaultHolder implements InventoryHolder {
/**
* Gets the vault number this holder is currently using
*
*
* @return the vault number
*/
public int getVaultNumber() {
@@ -32,7 +32,7 @@ public class VaultHolder implements InventoryHolder {
/**
* Sets the inventory this vault holder holds
*
*
* @param inventory the inventory, may be null
*/
public void setInventory(Inventory inventory) {