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

Rework operations to allow for owners of vaults to be Strings, which is more friendly to third party or group vaults. Fixes compatibility with FactionsUUID.

Browse Source
This commit is contained in:
Trent Hensler
2018-12-16 22:13:13 -08:00
parent 55cbea8582
commit 181bb89ac0
17 changed files with 121 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
+12 -8
View File
@@ -33,15 +33,15 @@ public class VaultCommand implements CommandExecutor {
switch (args.length) {
case 1:
if (VaultOperations.openOwnVault(player, args[0])) {
PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(player.getUniqueId(), Integer.parseInt(args[0])));
PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(player.getUniqueId().toString(), Integer.parseInt(args[0])));
} else if (sender.hasPermission("playervaults.admin")) {
OfflinePlayer searchPlayer = Bukkit.getOfflinePlayer(args[0]);
if (searchPlayer == null || !searchPlayer.hasPlayedBefore()) {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PLAYER_FOUND.toString().replaceAll("%p", args[0]));
break;
String target = args[0];
if (searchPlayer != null && searchPlayer.hasPlayedBefore()) {
target = searchPlayer.getUniqueId().toString();
}
YamlConfiguration file = VaultManager.getInstance().getPlayerVaultFile(searchPlayer.getUniqueId());
YamlConfiguration file = VaultManager.getInstance().getPlayerVaultFile(target, false);
if (file == null) {
sender.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
} else {
@@ -68,11 +68,15 @@ public class VaultCommand implements CommandExecutor {
return true;
}
String target = args[0];
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(args[0]);
if (offlinePlayer != null && VaultOperations.openOtherVault(player, offlinePlayer.getUniqueId(), args[1])) {
PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(offlinePlayer.getUniqueId(), number));
if(offlinePlayer != null && offlinePlayer.hasPlayedBefore()) {
target = offlinePlayer.getUniqueId().toString();
}
if (VaultOperations.openOtherVault(player, target, args[1])) {
PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(target, number));
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PLAYER_FOUND.toString().replaceAll("%p", args[0]));
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_OWNER_FOUND.toString().replaceAll("%p", args[0]));
}
break;
default: