Skip to content

Fix from khisabkurniawn and Safe "unsafe" method. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tufulbo wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix from khisabkurniawn and Safe "unsafe" method. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
908b53e
fix: handle empty placeholders in unsafe parse to prevent crash
khisabkurniawn Apr 14, 2025
22a85c1
Update ParseOtherExpansion.java
tufulbo May 7, 2025
369787e
Update ParseOtherExpansion.java
tufulbo May 7, 2025
c5f36fd
Create maven-publish.yml
tufulbo May 7, 2025
dfab53f
Delete .github/workflows/maven-publish.yml
tufulbo May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.2</version>
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
89 changes: 42 additions & 47 deletions src/ParseOtherExpansion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,56 +27,51 @@ public String getVersion() {
@SuppressWarnings("deprecation")
@Override
public String onRequest(OfflinePlayer p, String s) {

boolean unsafe = false;
if (s.startsWith("unsafe_")) {
s = s.substring(7);
unsafe = true;
}

String[] strings = s.split("(?<!\\\\)\\}_", 2);
strings[0] = strings[0].substring(1);
strings[0] = strings[0].replaceAll("\\\\}_", "}_");
strings[1] = strings[1].substring(1, strings[1].length() - 1);
OfflinePlayer player;
if (unsafe) {
String user = PlaceholderAPI.setPlaceholders(p, ("%" + strings[0] + "%"));
if (user.contains("%")) {
try {
UUID id = UUID.fromString(strings[0]);
player = Bukkit.getOfflinePlayer(id);
if (player.getName() == null)
player = Bukkit.getOfflinePlayer(strings[0]);
} catch (IllegalArgumentException e) {
player = Bukkit.getOfflinePlayer(strings[0]);
}
} else {
try {
UUID id = UUID.fromString(user);
player = Bukkit.getOfflinePlayer(id);
if (player.getName() == null)
player = Bukkit.getOfflinePlayer(user);
} catch (IllegalArgumentException e) {
player = Bukkit.getOfflinePlayer(user);
}
boolean unsafe = false;
if (s.startsWith("unsafe_")) {
s = s.substring(7);
unsafe = true;
}
} else {
String user = strings[0];

String[] strings = s.split("(?<!\\\\)\\}_", 2);
strings[0] = strings[0].substring(1);
strings[0] = strings[0].replaceAll("\\\\}_", "}_");
strings[1] = strings[1].substring(1, strings[1].length() - 1);

OfflinePlayer target = null;
String input = strings[0];

if (unsafe) {
String resolved = PlaceholderAPI.setPlaceholders(p, "%" + input + "%");
input = (resolved == null || resolved.contains("%") || resolved.isEmpty()) ? input : resolved;
}

// Intentar como UUID primero
try {
UUID id = UUID.fromString(user);
player = Bukkit.getOfflinePlayer(id);
if (player.getName() == null)
player = Bukkit.getOfflinePlayer(user);
UUID id = UUID.fromString(input);
OfflinePlayer found = Bukkit.getOfflinePlayer(id);
if (found.hasPlayedBefore()) {
target = found;
}
} catch (IllegalArgumentException e) {
player = Bukkit.getOfflinePlayer(user);
for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
if (op.getName() != null && op.getName().equalsIgnoreCase(input)) {
target = op;
break;
}
}
}
if (target == null || !target.hasPlayedBefore()) {
return "";
}
}
String placeholder = PlaceholderAPI.setPlaceholders(player, ("%" + strings[1] + "%"));
if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
placeholder = strings[1];
}
return PlaceholderAPI.setPlaceholders(player, placeholder);

String placeholder = PlaceholderAPI.setPlaceholders(target, "%" + strings[1] + "%");
if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
return "";
}

return placeholder;
}



}