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/Listeners.java
+1 -1
View File
@@ -169,7 +169,7 @@ public class Listeners implements Listener {
if (!self) { if (!self) {
owner = PlayerVaults.SIGNS.getString(world + ";;" + x + ";;" + y + ";;" + z + ".owner"); owner = PlayerVaults.SIGNS.getString(world + ";;" + x + ";;" + y + ";;" + z + ".owner");
} }
Inventory inv = PlayerVaults.VM.loadVault((self) ? player.getName() : owner, num, !player.hasPermission("playervaults.small")); Inventory inv = PlayerVaults.VM.loadVault((self) ? player.getName() : owner, num);
player.openInventory(inv); player.openInventory(inv);
PlayerVaults.IN_VAULT.put(player.getName(), new VaultViewInfo((self) ? player.getName() : owner, num)); PlayerVaults.IN_VAULT.put(player.getName(), new VaultViewInfo((self) ? player.getName() : owner, num));
event.setCancelled(true); event.setCancelled(true);
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.hasPermission("playervaults.signs.set")) {
if (sender instanceof Player) { if (sender instanceof Player) {
if (args.length == 1) { if (args.length == 1) {
int i = 0; int i;
try { try {
i = Integer.parseInt(args[0]); i = Integer.parseInt(args[0]);
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
@@ -74,7 +74,7 @@ public class Commands implements CommandExecutor {
PlayerVaults.SET_SIGN.put(sender.getName(), new SignSetInfo(i)); PlayerVaults.SET_SIGN.put(sender.getName(), new SignSetInfo(i));
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN); sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
} else if (args.length >= 2) { } else if (args.length >= 2) {
int i = 0; int i;
try { try {
i = Integer.parseInt(args[1]); i = Integer.parseInt(args[1]);
} catch (NumberFormatException nfe) { } 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) { public static boolean openOwnVault(Player player, String arg) {
if (arg.matches("^[0-9]{1,2}$")) { if (arg.matches("^[0-9]{1,2}$")) {
int number = 0; int number;
try { try {
number = Integer.parseInt(arg); number = Integer.parseInt(arg);
if (number == 0) if (number == 0)
@@ -45,9 +45,9 @@ public class VaultOperations {
return false; return false;
} }
if (checkPerms(player, number)) { if (checkPerms(player, number)) {
if (EconomyOperations.payToOpen(player)) { if (EconomyOperations.payToOpen(player, number)) {
PlayerVaults.log.info(String.valueOf(player.hasPermission("playervaults.small"))); 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.openInventory(inv);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg)); player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
return true; return true;
@@ -82,7 +82,7 @@ public class VaultOperations {
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); 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.openInventory(inv);
player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", holder)); player.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", holder));
return true; return true;
@@ -98,7 +98,6 @@ public class VaultOperations {
/** /**
* Delete a player's own vault. * Delete a player's own vault.
* @param player The player to delete. * @param player The player to delete.
* @param user The user to whom the deleted vault belongs.
* @param arg The vault number to delete. * @param arg The vault number to delete.
*/ */
public static void deleteOwnVault(Player player, String arg) { public static void deleteOwnVault(Player player, String arg) {
@@ -115,7 +114,6 @@ public class VaultOperations {
try { try {
if (EconomyOperations.refundOnDelete(player, number)) { if (EconomyOperations.refundOnDelete(player, number)) {
PlayerVaults.VM.deleteVault(player, player.getName(), number); PlayerVaults.VM.deleteVault(player, player.getName(), number);
return;
} }
} catch (IOException e) { } catch (IOException e) {
player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); 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 holder The user to whom the deleted vault belongs.
* @param arg The vault number to delete. * @param arg The vault number to delete.
*/ */
public static void deleteOtherVault(CommandSender sender, String holder, String arg) { public static void deleteOtherVault(CommandSender player, String holder, String arg) {
if (sender.hasPermission("playervaults.delete")) { if (player.hasPermission("playervaults.delete")) {
if (arg.matches("^[0-9]{1,2}$")) { if (arg.matches("^[0-9]{1,2}$")) {
int number = 0; int number = 0;
try { try {
number = Integer.parseInt(arg); number = Integer.parseInt(arg);
if (number == 0) { 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; return;
} }
} catch (NumberFormatException nfe) { } 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 { try {
PlayerVaults.VM.deleteVault(sender, holder, number); PlayerVaults.VM.deleteVault(player, holder, number);
} catch (IOException e) { } catch (IOException e) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); player.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
} }
} else { } else {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER); player.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
} }
} else { } else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS); player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
} }
} }
src/main/java/com/drtshock/playervaults/util/EconomyOperations.java
+9 -9
View File
@@ -3,7 +3,6 @@ package com.drtshock.playervaults.util;
import com.drtshock.playervaults.PlayerVaults; import com.drtshock.playervaults.PlayerVaults;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
@@ -18,15 +17,14 @@ import org.bukkit.entity.Player;
*/ */
public class EconomyOperations { public class EconomyOperations {
private static File CONFIG_FILE;
private static YamlConfiguration BUKKIT_CONFIG = new YamlConfiguration(); private static YamlConfiguration BUKKIT_CONFIG = new YamlConfiguration();
public static PlayerVaults PLUGIN; public static PlayerVaults PLUGIN;
public EconomyOperations(PlayerVaults instance) throws FileNotFoundException, IOException, InvalidConfigurationException { public EconomyOperations(PlayerVaults instance) throws IOException, InvalidConfigurationException {
PLUGIN = instance; PLUGIN = instance;
CONFIG_FILE = new File(PLUGIN.getDataFolder(), "config.yml"); File config = new File(PLUGIN.getDataFolder(), "config.yml");
BUKKIT_CONFIG.load(CONFIG_FILE); BUKKIT_CONFIG.load(config);
} }
/** /**
@@ -34,17 +32,19 @@ public class EconomyOperations {
* @param player The player to pay. * @param player The player to pay.
* @return The transaction success. * @return The transaction success.
*/ */
public static boolean payToOpen(Player player) { public static boolean payToOpen(Player player, int number) {
if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !PlayerVaults.USE_VAULT) if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !PlayerVaults.USE_VAULT)
return true; return true;
if (PlayerVaults.VM.vaultExists(player.getName(), number)) {
double cost = BUKKIT_CONFIG.getDouble("economy.cost-to-open", 10); return payToCreate(player);
} else {
double cost = BUKKIT_CONFIG.getDouble("economy.cost-to-create", 100);
EconomyResponse resp = PlayerVaults.ECON.withdrawPlayer(player.getName(), cost); EconomyResponse resp = PlayerVaults.ECON.withdrawPlayer(player.getName(), cost);
if (resp.transactionSuccess()) { if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_OPEN.toString().replaceAll("%price", "" + cost)); player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_OPEN.toString().replaceAll("%price", "" + cost));
return true; return true;
} }
}
return false; return false;
} }
src/main/java/com/drtshock/playervaults/util/Serialization.java
+2 -2
View File
@@ -71,9 +71,9 @@ public class Serialization {
return result; return result;
} }
public static Inventory toInventory(List<String> stringItems, int number, boolean large) { public static Inventory toInventory(List<String> stringItems, int number) {
VaultHolder holder = new VaultHolder(number); VaultHolder holder = new VaultHolder(number);
Inventory inv = Bukkit.createInventory(holder, (large) ? 54 : 27, ChatColor.RED + "Vault #" + number); Inventory inv = Bukkit.createInventory(holder, 54, ChatColor.RED + "Vault #" + number);
holder.setInventory(inv); holder.setInventory(inv);
List<ItemStack> contents = new ArrayList<ItemStack>(); List<ItemStack> contents = new ArrayList<ItemStack>();
for (String piece : stringItems) { for (String piece : stringItems) {
src/main/java/com/drtshock/playervaults/util/Updater.java
+1 -2
View File
@@ -15,7 +15,7 @@ import org.xml.sax.SAXException;
public class Updater { public class Updater {
public Updater(String v) throws SAXException, IOException, ParserConfigurationException { public Updater(String v) throws SAXException, IOException, ParserConfigurationException {
oldVersion = v.substring(0, 5); String oldVersion = v.substring(0, 5);
HttpURLConnection connection = (HttpURLConnection) new URL("http://dev.bukkit.org/projects/playervaults/files.rss").openConnection(); HttpURLConnection connection = (HttpURLConnection) new URL("http://dev.bukkit.org/projects/playervaults/files.rss").openConnection();
connection.setConnectTimeout(10000); connection.setConnectTimeout(10000);
connection.setReadTimeout(10000); connection.setReadTimeout(10000);
@@ -31,7 +31,6 @@ public class Updater {
update = !newVersion.equals(oldVersion); update = !newVersion.equals(oldVersion);
} }
private String oldVersion;
private String newVersion; private String newVersion;
private String link; private String link;
private boolean update; private boolean update;
src/main/java/com/drtshock/playervaults/util/VaultManager.java
+9 -4
View File
@@ -60,7 +60,7 @@ public class VaultManager {
* @param holder The holder of the vault. * @param holder The holder of the vault.
* @param number The vault number. * @param number The vault number.
*/ */
public Inventory loadVault(String holder, int number, boolean large) { public Inventory loadVault(String holder, int number) {
VaultViewInfo info = new VaultViewInfo(holder, number); VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv = null; Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) { if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
@@ -73,7 +73,7 @@ public class VaultManager {
vaultHolder.setInventory(inv); vaultHolder.setInventory(inv);
} else { } else {
List<String> data = new ArrayList<String>(); List<String> data = new ArrayList<String>();
for (int x = 0; x < ((large) ? 54 : 27); x++) { for (int x = 0; x < 54; x++) {
String line = playerFile.getString("vault" + number + "." + x); String line = playerFile.getString("vault" + number + "." + x);
if (line != null) { if (line != null) {
data.add(line); data.add(line);
@@ -81,7 +81,7 @@ public class VaultManager {
data.add("null"); data.add("null");
} }
} }
inv = Serialization.toInventory(data, number, large); inv = Serialization.toInventory(data, number);
} }
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv); PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
} }
@@ -103,11 +103,16 @@ public class VaultManager {
vaultHolder.setInventory(inv); vaultHolder.setInventory(inv);
return inv; return inv;
} else { } else {
Inventory inv = Serialization.toInventory(data, number, true); Inventory inv = Serialization.toInventory(data, number);
return inv; return inv;
} }
} }
public boolean vaultExists(String holder, int number) {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
return playerFile.contains("vault" + number);
}
/** /**
* Deletes a players vault. * Deletes a players vault.
* @param sender The sender of whom to send messages to. * @param sender The sender of whom to send messages to.