Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-30 12:11:37 +01:00
Code Issues Projects Releases Wiki Activity

Support PlaceholderAPI variables in objective-overrides, per #980

Browse Source
This commit is contained in:
PikaMug 2019-11-08 15:16:27 -05:00
parent fd04e25976
commit 2c5f09dec8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2082,7 +2082,7 @@ public class Quester {
if (getCurrentStage(quest).objectiveOverride != null) { if (getCurrentStage(quest).objectiveOverride != null) {
String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + getCurrentStage(quest) String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + getCurrentStage(quest)
.objectiveOverride; .objectiveOverride;
p.sendMessage(message); p.sendMessage(ConfigUtil.parseString(message, p));
} else if (objective.equalsIgnoreCase("password")) { } else if (objective.equalsIgnoreCase("password")) {
String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + pass; String message = ChatColor.GREEN + "(" + Lang.get(p, "completed") + ") " + pass;
p.sendMessage(message); p.sendMessage(message);

8
main/src/main/java/me/blackvein/quests/util/ConfigUtil.java
View File

@ -151,6 +151,14 @@ public class ConfigUtil {
} }
return parsed; return parsed;
} }
public static String parseString(String s, Player player) {
String parsed = parseString(s);
if (Dependencies.placeholder != null && player != null) {
parsed = PlaceholderAPI.setPlaceholders(player, parsed);
}
return parsed;
}
public static String parseString(String s, NPC npc) { public static String parseString(String s, NPC npc) {
String parsed = parseString(s); String parsed = parseString(s);