Upstream/EpicEnchants
1
0
Fork 0
mirror of https://github.com/songoda/EpicEnchants.git synced 2024-09-27 23:27:42 +02:00
Code Issues Projects Releases Wiki Activity

Fix for placeholder api conflict.

Browse Source
This commit is contained in:
Brianna 2019-11-02 10:45:06 -04:00
parent 68464516fb
commit b6dc724228
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/songoda/epicenchants/utils/single/Placeholders.java
View File

@ -89,8 +89,9 @@ public class Placeholders {
return setPlaceholders(input, user, opponent, level, null); return setPlaceholders(input, user, opponent, level, null);
} }
public static String setPlaceholders(String input, Player user, LivingEntity opponent, int level, Event event) { public static String setPlaceholders(String in, Player user, LivingEntity opponent, int level, Event event) {
AtomicReference<String> output = new AtomicReference<>(input.replace("{level}", "" + level)); String input = in.replace("{level}", String.valueOf(level));
AtomicReference<String> output = new AtomicReference<>(input);
PLAYER_FUNCTIONS.forEach((toReplace, function) -> output.updateAndGet(string -> string.replace(toReplace, function.apply(user, opponent).toString()))); PLAYER_FUNCTIONS.forEach((toReplace, function) -> output.updateAndGet(string -> string.replace(toReplace, function.apply(user, opponent).toString())));
REGEX_CONSUMERS.forEach(consumer -> consumer.accept(output)); REGEX_CONSUMERS.forEach(consumer -> consumer.accept(output));
@ -99,9 +100,8 @@ public class Placeholders {
if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) { if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
output.updateAndGet(string -> PlaceholderAPI.setPlaceholders(user, string)); output.updateAndGet(string -> PlaceholderAPI.setPlaceholders(user, string));
if (opponent instanceof Player) { if (opponent instanceof Player)
output.updateAndGet(string -> PlaceholderAPI.setRelationalPlaceholders(user, (Player) opponent, input)); output.updateAndGet(string -> PlaceholderAPI.setRelationalPlaceholders(user, (Player) opponent, input));
}
} }
return output.get(); return output.get();