Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reject null Lang keys, see #1983

This commit is contained in:
PikaMug 2022-07-06 01:03:23 -04:00
parent f12a592f06
commit 03136d8945
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,9 @@ public class Lang {
*/
@SuppressWarnings("deprecation")
public static String get(final Player player, final String key) {
if (key == null) {
return null;
}
if (player == null) {
return get(key);
}
@ -108,6 +111,9 @@ public class Lang {
* @return formatted string, plus processing through PlaceholderAPI by clip
*/
public static String get(final CommandSender commandSender, final String key) {
if (key == null) {
return null;
}
if (commandSender instanceof Player) {
return get((Player)commandSender, key);
}
@ -121,6 +127,9 @@ public class Lang {
* @return formatted string
*/
public static String get(final String key) {
if (key == null) {
return null;
}
return defaultLang.containsKey(key) ? LangToken.convertString(defaultLang.get(key)) : "NULL";
}
@ -323,12 +332,15 @@ public class Lang {
}
public static String convertString(String s) {
if (s == null) {
return null;
}
if (tokenMap.isEmpty()) {
LangToken.init();
}
for (final String token : tokenMap.keySet()) {
s = s.replace(token, tokenMap.get(token));
s = s.replace(token.toUpperCase(), tokenMap.get(token));
for (final Entry<String, String> token : tokenMap.entrySet()) {
s = s.replace(token.getKey(), token.getValue());
s = s.replace(token.getKey().toUpperCase(), token.getValue());
}
final Matcher matcher = hexPattern.matcher(s);
while (matcher.find()) {
@ -344,6 +356,9 @@ public class Lang {
}
public static String convertString(final Player p, String s) {
if (s == null) {
return null;
}
if (tokenMap.isEmpty()) {
LangToken.init();
}