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

Make things not so staticy

Browse Source
This commit is contained in:
drtshock
2014-04-24 10:08:50 -05:00
parent b704929834
commit e3da6580ba
8 changed files with 138 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/vaultmanagement/EconomyOperations.java
+7 -7
View File
@@ -50,14 +50,14 @@ public class EconomyOperations {
* @return The transaction success.
*/
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.getInstance().getEconomy() != null) {
return true;
}
if (PlayerVaults.VM.vaultExists(player.getName(), number)) {
if (UUIDVaultManager.getInstance().vaultExists(player.getUniqueId(), number)) {
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.getInstance().getEconomy().withdrawPlayer(player.getName(), cost);
if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_OPEN.toString().replaceAll("%price", "" + cost));
return true;
@@ -74,12 +74,12 @@ public class EconomyOperations {
* @return The transaction success
*/
public static boolean payToCreate(Player player) {
if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !PlayerVaults.USE_VAULT) {
if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || PlayerVaults.getInstance().getEconomy() != null) {
return true;
}
double cost = BUKKIT_CONFIG.getDouble("economy.cost-to-create", 100);
EconomyResponse resp = PlayerVaults.ECON.withdrawPlayer(player.getName(), cost);
EconomyResponse resp = PlayerVaults.getInstance().getEconomy().withdrawPlayer(player.getName(), cost);
if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.COST_TO_CREATE.toString().replaceAll("%price", "" + cost));
return true;
@@ -97,7 +97,7 @@ public class EconomyOperations {
*/
public static boolean refundOnDelete(Player player, int number) {
String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults";
if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || !PlayerVaults.USE_VAULT) {
if (!BUKKIT_CONFIG.getBoolean("economy.enabled") || player.hasPermission("playervaults.free") || PlayerVaults.getInstance().getEconomy() != null) {
return true;
}
String name = player.getName().toLowerCase();
@@ -113,7 +113,7 @@ public class EconomyOperations {
return false;
}
double cost = BUKKIT_CONFIG.getDouble("economy.refund-on-delete");
EconomyResponse resp = PlayerVaults.ECON.depositPlayer(player.getName(), cost);
EconomyResponse resp = PlayerVaults.getInstance().getEconomy().depositPlayer(player.getName(), cost);
if (resp.transactionSuccess()) {
player.sendMessage(Lang.TITLE.toString() + Lang.REFUND_AMOUNT.toString().replaceAll("%price", String.valueOf(cost)));
return true;
src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+6 -6
View File
@@ -70,8 +70,8 @@ public class UUIDVaultManager {
}
VaultViewInfo info = new VaultViewInfo(player.getUniqueId().toString(), number);
Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
inv = PlayerVaults.OPENINVENTORIES.get(info.toString());
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(player.getUniqueId());
if (playerFile.getConfigurationSection("vault" + number) == null) {
@@ -90,7 +90,7 @@ public class UUIDVaultManager {
inv = getInventory(playerFile, size, number);
}
}
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
}
return inv;
}
@@ -107,8 +107,8 @@ public class UUIDVaultManager {
}
VaultViewInfo info = new VaultViewInfo(holder.toString(), number);
Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
inv = PlayerVaults.OPENINVENTORIES.get(info.toString());
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
if (playerFile.getConfigurationSection("vault" + number) == null) {
@@ -120,7 +120,7 @@ public class UUIDVaultManager {
inv = getInventory(playerFile, size, number);
}
}
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
}
return inv;
}
src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+6 -6
View File
@@ -86,8 +86,8 @@ public class VaultManager {
}
VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
inv = PlayerVaults.OPENINVENTORIES.get(info.toString());
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
if (playerFile.getConfigurationSection("vault" + number) == null) {
@@ -110,7 +110,7 @@ public class VaultManager {
inv = getInventory(playerFile, size, number);
}
}
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
}
return inv;
}
@@ -128,8 +128,8 @@ public class VaultManager {
}
VaultViewInfo info = new VaultViewInfo(holder, number);
Inventory inv = null;
if (PlayerVaults.OPENINVENTORIES.containsKey(info.toString())) {
inv = PlayerVaults.OPENINVENTORIES.get(info.toString());
if (PlayerVaults.getInstance().getOpenInventories().containsKey(info.toString())) {
inv = PlayerVaults.getInstance().getOpenInventories().get(info.toString());
} else {
YamlConfiguration playerFile = getPlayerVaultFile(holder);
if (playerFile.getConfigurationSection("vault" + number) == null) {
@@ -141,7 +141,7 @@ public class VaultManager {
inv = getInventory(playerFile, size, number);
}
}
PlayerVaults.OPENINVENTORIES.put(info.toString(), inv);
PlayerVaults.getInstance().getOpenInventories().put(info.toString(), inv);
}
return inv;
}