Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed placeholders looping

Browse Source
This commit is contained in:
Indyuce 2022-08-18 14:06:04 +02:00
parent a299325b39
commit 632ee8abb1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/Placeholders.java
View File

@ -19,9 +19,17 @@ public class Placeholders {
// Remove conditions first // Remove conditions first
str = removeCondition(str); str = removeCondition(str);
/*
* For MMOCore not to loop on unparsable placeholders, it keeps
* track of the "last placeholder" parsed. The 'explored' string
* has NO parsed placeholder.
*/
String explored = str;
// Internal placeholders // Internal placeholders
while (str.contains("{") && str.substring(str.indexOf("{")).contains("}")) { while (explored.contains("{") && explored.substring(explored.indexOf("{")).contains("}")) {
String holder = str.substring(str.indexOf("{") + 1, str.indexOf("}")); final int begin = explored.indexOf("{"), end = explored.indexOf("}");
final String holder = explored.substring(begin + 1, end);
@Nullable String found = placeholders.get(holder); @Nullable String found = placeholders.get(holder);
/* /*
@ -32,6 +40,9 @@ public class Placeholders {
*/ */
if (found != null) if (found != null)
str = str.replace("{" + holder + "}", found); str = str.replace("{" + holder + "}", found);
// Increase counter
explored = explored.substring(end + 1);
} }
// External placeholders // External placeholders