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

Use proper conventions.

Browse Source
This commit is contained in:
drtshock
2013-04-15 18:42:29 -05:00
parent 4f8b8539e7
commit be1d53ed7e
9 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/commands/Commands.java
+3 -3
View File
@@ -15,7 +15,7 @@ import com.drtshock.playervaults.util.Lang;
public class Commands implements CommandExecutor {
public static HashMap<String, VaultViewInfo> inVault = new HashMap<String, VaultViewInfo>();
public static HashMap<String, VaultViewInfo> IN_VAULT = new HashMap<String, VaultViewInfo>();
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
@@ -25,11 +25,11 @@ public class Commands implements CommandExecutor {
switch (args.length) {
case 1:
if(VaultOperations.openOwnVault(p, args[0]))
inVault.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
IN_VAULT.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
break;
case 2:
if(VaultOperations.openOtherVault(p, args[0], args[1]))
inVault.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
IN_VAULT.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
break;
default:
Feedback.showHelp(sender, Feedback.Type.OPEN);
src/main/java/com/drtshock/playervaults/commands/VaultOperations.java
+7 -7
View File
@@ -6,15 +6,15 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.drtshock.playervaults.Main;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.util.EconomyOperations;
import com.drtshock.playervaults.util.Lang;
import com.drtshock.playervaults.util.VaultManager;
public class VaultOperations {
private static Main plugin;
private static VaultManager vm = new VaultManager(plugin);
private static PlayerVaults PLUGIN;
private static VaultManager VAULT_MANAGER = new VaultManager(PLUGIN);
public static boolean checkPerms(CommandSender cs, int number) {
if(cs.hasPermission("playervaults.amount." + String.valueOf(number))) return true;
@@ -44,7 +44,7 @@ public class VaultOperations {
}
if(checkPerms(sender, number)) {
if(EconomyOperations.payToOpen(sender)) {
vm.loadVault(sender, sender.getName(), number);
VAULT_MANAGER.loadVault(sender, sender.getName(), number);
sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg));
return true;
} else {
@@ -79,7 +79,7 @@ public class VaultOperations {
} catch(NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
vm.loadVault(sender, user, number);
VAULT_MANAGER.loadVault(sender, user, number);
sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", user));
return true;
} else {
@@ -111,7 +111,7 @@ public class VaultOperations {
}
try {
if(EconomyOperations.refundOnDelete(sender, number)) {
vm.deleteVault(sender, sender.getName(), number);
VAULT_MANAGER.deleteVault(sender, sender.getName(), number);
return;
}
} catch(IOException e) {
@@ -143,7 +143,7 @@ public class VaultOperations {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
}
try {
vm.deleteVault(sender, user, number);
VAULT_MANAGER.deleteVault(sender, user, number);
} catch(IOException e) {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR);
}