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

Retain cross-version compatibility & cleanup (#374)

Browse Source
This commit is contained in:
ArtelGG
2018-12-17 22:58:55 -05:00
committed by Trent Hensler
parent df624afedc
commit 88e0351826
25 changed files with 160 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
+3 -7
View File
@@ -26,7 +26,7 @@ public class ConvertCommand implements CommandExecutor {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
} else {
if (args.length == 0) {
sender.sendMessage(Lang.TITLE + "/pvconvert <all | plugin name>");
sender.sendMessage(Lang.TITLE + "/" + label + " <all | plugin name>");
} else {
String name = args[0];
final List<Converter> applicableConverters = new ArrayList<>();
@@ -39,7 +39,6 @@ public class ConvertCommand implements CommandExecutor {
}
}
}
if (applicableConverters.size() <= 0) {
sender.sendMessage(Lang.TITLE.toString() + Lang.CONVERT_PLUGIN_NOT_FOUND);
} else {
@@ -50,21 +49,18 @@ public class ConvertCommand implements CommandExecutor {
public void run() {
int converted = 0;
VaultOperations.setLocked(true);
for (Converter converter : applicableConverters) {
if (converter.canConvert()) {
converted += converter.run(sender);
}
}
VaultOperations.setLocked(false);
sender.sendMessage(Lang.TITLE + Lang.CONVERT_COMPLETE.toString().replace("%converted", converted + ""));
}
}, 5); // This comment is to annoy evilmidget38
}, 5);
}
}
}
return true;
}
}
}
src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java
+3 -6
View File
@@ -18,7 +18,6 @@ public class DeleteCommand implements CommandExecutor {
sender.sendMessage(Lang.TITLE + Lang.LOCKED.toString());
return true;
}
switch (args.length) {
case 1:
if (sender instanceof Player) {
@@ -40,15 +39,13 @@ public class DeleteCommand implements CommandExecutor {
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT_ALL.toString().replaceAll("%p", target));
break;
}
VaultOperations.deleteOtherVault(sender, target, args[1]);
break;
default:
sender.sendMessage(Lang.TITLE + "/pvdel <number>");
sender.sendMessage(Lang.TITLE + "/pvdel <player> <number>");
sender.sendMessage(Lang.TITLE + "/pvdel <player> all");
sender.sendMessage(Lang.TITLE + "/" + label + " <number>");
sender.sendMessage(Lang.TITLE + "/" + label + " <player> <number>");
sender.sendMessage(Lang.TITLE + "/" + label + " <player> all");
}
return true;
}
}
src/main/java/com/drtshock/playervaults/commands/SignCommand.java
+2 -2
View File
@@ -19,7 +19,7 @@ public class SignCommand implements CommandExecutor {
i = Integer.parseInt(args[0]);
} catch (NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " <owner> <#>");
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " [owner] <#>");
return true;
}
PlayerVaults.getInstance().getSetSign().put(sender.getName(), new SignSetInfo(i));
@@ -30,7 +30,7 @@ public class SignCommand implements CommandExecutor {
i = Integer.parseInt(args[1]);
} catch (NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " <owner> <#>");
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " [owner] <#>");
return true;
}
PlayerVaults.getInstance().getSetSign().put(sender.getName(), new SignSetInfo(args[0].toLowerCase(), i));
src/main/java/com/drtshock/playervaults/commands/SignSetInfo.java
+1 -1
View File
@@ -22,8 +22,8 @@ package com.drtshock.playervaults.commands;
*/
public class SignSetInfo {
private String owner;
private final int number;
private String owner;
private boolean self = false;
/**