Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-18 23:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Permit /questadmin commands on offline players, part 2. Per #1040

Browse Source
This commit is contained in:
PikaMug 2020-01-22 01:50:05 -05:00
parent 6fdf35a13c
commit 7d4a08d8b6
3 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -326,8 +326,13 @@ public class Quester {
}
public void updateJournal() {
if (!hasJournal)
if (!hasJournal) {
return;
}
if (!getPlayer().isOnline()) {
plugin.getLogger().info("Could not update Quests Journal for " + getPlayer().getName() + " while offline");
return;
}
Inventory inv = getPlayer().getInventory();
ItemStack[] arr = inv.getContents();
int index = -1;

71
main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
View File

@ -872,7 +872,7 @@ public class CmdExecutor implements CommandExecutor {
public String getQuestsCommandUsage(String cmd) {
return ChatColor.RED + Lang.get("usage") + ": " + ChatColor.YELLOW + "/quests "
+ Lang.get(Lang.getCommandKey(cmd) + "_HELP");
+ Lang.get(Lang.getKeyFromPrefix("COMMAND_", cmd) + "_HELP");
}
private void adminHelp(final CommandSender cs) {
@ -1238,41 +1238,44 @@ public class CmdExecutor implements CommandExecutor {
}
private void adminQuit(final CommandSender cs, String[] args) {
try {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.quit")) {
Player target = getPlayer(args[1]);
if (target == null) {
if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.quit")) {
OfflinePlayer target = getPlayer(args[1]);
if (target == null) {
try {
target = Bukkit.getOfflinePlayer(UUID.fromString(args[1]));
} catch (IllegalArgumentException e) {
cs.sendMessage(ChatColor.YELLOW + Lang.get("playerNotFound"));
} else {
Quester quester = plugin.getQuester(target.getUniqueId());
if (quester.getCurrentQuests().isEmpty()) {
String msg = Lang.get("noCurrentQuest");
msg = msg.replace("<player>", target.getName());
cs.sendMessage(ChatColor.YELLOW + msg);
} else {
Quest quest = plugin.getQuest(concatArgArray(args, 2, args.length - 1, ' '));
if (quest == null) {
cs.sendMessage(ChatColor.RED + Lang.get("questNotFound"));
return;
}
quester.hardQuit(quest);
String msg1 = Lang.get("questForceQuit");
msg1 = msg1.replace("<player>", ChatColor.GREEN + target.getName() + ChatColor.GOLD);
msg1 = msg1.replace("<quest>", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.GOLD);
cs.sendMessage(ChatColor.GOLD + msg1);
String msg2 = Lang.get(target, "questForcedQuit");
msg2 = msg2.replace("<player>", ChatColor.GREEN + cs.getName() + ChatColor.GOLD);
msg2 = msg2.replace("<quest>", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.GOLD);
target.sendMessage(ChatColor.GREEN + msg2);
quester.saveData();
quester.updateJournal();
}
return;
}
} else {
cs.sendMessage(ChatColor.RED + Lang.get("noPermission"));
}
} catch (NullPointerException npe) {
npe.printStackTrace();
Quester quester = plugin.getQuester(target.getUniqueId());
if (quester.getCurrentQuests().isEmpty()) {
String msg = Lang.get("noCurrentQuest");
msg = msg.replace("<player>", target.getName());
cs.sendMessage(ChatColor.YELLOW + msg);
} else {
Quest quest = plugin.getQuest(concatArgArray(args, 2, args.length - 1, ' '));
if (quest == null) {
cs.sendMessage(ChatColor.RED + Lang.get("questNotFound"));
return;
}
quester.hardQuit(quest);
String msg1 = Lang.get("questForceQuit");
msg1 = msg1.replace("<player>", ChatColor.GREEN + target.getName() + ChatColor.GOLD);
msg1 = msg1.replace("<quest>", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.GOLD);
cs.sendMessage(ChatColor.GOLD + msg1);
if (target.isOnline()) {
Player p = (Player)target;
String msg2 = Lang.get(p, "questForcedQuit");
msg2 = msg2.replace("<player>", ChatColor.GREEN + cs.getName() + ChatColor.GOLD);
msg2 = msg2.replace("<quest>", ChatColor.DARK_PURPLE + quest.getName() + ChatColor.GOLD);
p.sendMessage(ChatColor.GREEN + msg2);
}
quester.saveData();
quester.updateJournal();
}
} else {
cs.sendMessage(ChatColor.RED + Lang.get("noPermission"));
}
}
@ -1436,7 +1439,7 @@ public class CmdExecutor implements CommandExecutor {
public String getQuestadminCommandUsage(String cmd) {
return ChatColor.RED + Lang.get("usage") + ": " + ChatColor.YELLOW + "/questadmin "
+ Lang.get(Lang.getCommandKey(cmd) + "_HELP");
+ Lang.get(Lang.getKeyFromPrefix("COMMAND_QUESTADMIN_", cmd) + "_HELP");
}
private static Map<String, Integer> sort(Map<String, Integer> unsortedMap) {

17
main/src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -81,12 +81,12 @@ public class Lang {
/**
* Get key for lang string
* @param val
* @param value The lang string
* @return key or "NULL" as String
*/
public static String getKey(String val) {
public static String getKey(String value) {
for (Entry<String, String> entry : langMap.entrySet()) {
if (entry.getValue().equals(val)) {
if (entry.getValue().equals(value)) {
return entry.getKey();
}
}
@ -94,13 +94,14 @@ public class Lang {
}
/**
* Get key starting with "COMMAND_" for lang string
* @param val
* @return key or "NULL" as String
* Get prefixed key for lang value
* @param value The lang string
* @param keyPrefix String that the key starts with
* @return full key or "NULL" as String
*/
public static String getCommandKey(String val) {
public static String getKeyFromPrefix(String keyPrefix, String value) {
for (Entry<String, String> entry : langMap.entrySet()) {
if (entry.getValue().equalsIgnoreCase(val) && entry.getKey().toUpperCase().startsWith("COMMAND_")) {
if (entry.getValue().equalsIgnoreCase(value) && entry.getKey().toUpperCase().startsWith(keyPrefix)) {
return entry.getKey();
}
}