From 908b53eeb0196ab4d44bfbc5fb131633cd4f062c Mon Sep 17 00:00:00 2001
From: Khisab Kurniawan <khisabkurniawan@outlook.com>
Date: Mon, 14 Apr 2025 10:54:36 +0700
Subject: [PATCH 1/5] fix: handle empty placeholders in unsafe parse to prevent
 crash

---
 pom.xml                      |  4 +--
 src/ParseOtherExpansion.java | 47 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index a9d6321..94dc219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/ParseOtherExpansion.java b/src/ParseOtherExpansion.java
index 509b275..8ec8f42 100644
--- a/src/ParseOtherExpansion.java
+++ b/src/ParseOtherExpansion.java
@@ -27,39 +27,38 @@ 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) {
+
+      if (user == null || user.isEmpty() || user.contains("%")) {
+        return "";
+      }
+
+      try {
+        UUID id = UUID.fromString(user);
+        player = Bukkit.getOfflinePlayer(id);
+        if (player.getName() == null)
           player = Bukkit.getOfflinePlayer(user);
+      } catch (IllegalArgumentException e) {
+        if (user.trim().isEmpty()) {
+          return "";
         }
+        player = Bukkit.getOfflinePlayer(user);
       }
+
     } else {
       String user = strings[0];
       try {
@@ -71,12 +70,14 @@ public String onRequest(OfflinePlayer p, String s) {
         player = Bukkit.getOfflinePlayer(user);
       }
     }
-    String placeholder = PlaceholderAPI.setPlaceholders(player, ("%" + strings[1] + "%"));
+
+    String placeholder = PlaceholderAPI.setPlaceholders(player, "%" + strings[1] + "%");
+
     if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
-      placeholder = strings[1];
+      return "";
     }
-    
-    return PlaceholderAPI.setPlaceholders(player, placeholder);
+
+    return placeholder;
   }
-  
+
 }

From 22a85c13cec5f2ad32a0876f4ae83436adb36555 Mon Sep 17 00:00:00 2001
From: juancruzdal <35972023+juancruzdal@users.noreply.github.com>
Date: Wed, 7 May 2025 01:43:49 -0300
Subject: [PATCH 2/5] Update ParseOtherExpansion.java

---
 src/ParseOtherExpansion.java | 75 +++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/src/ParseOtherExpansion.java b/src/ParseOtherExpansion.java
index 8ec8f42..6f843ed 100644
--- a/src/ParseOtherExpansion.java
+++ b/src/ParseOtherExpansion.java
@@ -27,57 +27,54 @@ 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);
+      boolean unsafe = false;
+      if (s.startsWith("unsafe_")) {
+          s = s.substring(7);
+          unsafe = true;
+      }
 
-    OfflinePlayer player;
+      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);
 
-    if (unsafe) {
-      String user = PlaceholderAPI.setPlaceholders(p, ("%" + strings[0] + "%"));
+      OfflinePlayer target = null;
+      String input = strings[0];
 
-      if (user == null || user.isEmpty() || user.contains("%")) {
-        return "";
+      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) {
-        if (user.trim().isEmpty()) {
-          return "";
-        }
-        player = Bukkit.getOfflinePlayer(user);
+          // No es UUID, intentar buscar por nombre entre jugadores ya conocidos
+          for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
+              if (op.getName() != null && op.getName().equalsIgnoreCase(input)) {
+                  target = op;
+                  break;
+              }
+          }
       }
 
-    } else {
-      String user = strings[0];
-      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);
+      // Si no se encontró jugador válido localmente, abortar
+      if (target == null || !target.hasPlayedBefore()) {
+          return "";
       }
-    }
-
-    String placeholder = PlaceholderAPI.setPlaceholders(player, "%" + strings[1] + "%");
 
-    if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
-      return "";
-    }
+      String placeholder = PlaceholderAPI.setPlaceholders(target, "%" + strings[1] + "%");
+      if (placeholder.startsWith("%") && placeholder.endsWith("%")) {
+          return "";
+      }
 
-    return placeholder;
+      return placeholder;
   }
 
+
 }

From 369787e50f9b56e1992fc8749cd1c4e4c8d556a5 Mon Sep 17 00:00:00 2001
From: juancruzdal <35972023+juancruzdal@users.noreply.github.com>
Date: Wed, 7 May 2025 01:44:13 -0300
Subject: [PATCH 3/5] Update ParseOtherExpansion.java

---
 src/ParseOtherExpansion.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/ParseOtherExpansion.java b/src/ParseOtherExpansion.java
index 6f843ed..5717267 100644
--- a/src/ParseOtherExpansion.java
+++ b/src/ParseOtherExpansion.java
@@ -54,7 +54,6 @@ public String onRequest(OfflinePlayer p, String s) {
               target = found;
           }
       } catch (IllegalArgumentException e) {
-          // No es UUID, intentar buscar por nombre entre jugadores ya conocidos
           for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
               if (op.getName() != null && op.getName().equalsIgnoreCase(input)) {
                   target = op;
@@ -62,8 +61,6 @@ public String onRequest(OfflinePlayer p, String s) {
               }
           }
       }
-
-      // Si no se encontró jugador válido localmente, abortar
       if (target == null || !target.hasPlayedBefore()) {
           return "";
       }

From c5f36fd9d64d4a045b83ce143abb0d657334d298 Mon Sep 17 00:00:00 2001
From: juancruzdal <35972023+juancruzdal@users.noreply.github.com>
Date: Wed, 7 May 2025 01:50:29 -0300
Subject: [PATCH 4/5] Create maven-publish.yml

---
 .github/workflows/maven-publish.yml | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/maven-publish.yml

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
new file mode 100644
index 0000000..267ad25
--- /dev/null
+++ b/.github/workflows/maven-publish.yml
@@ -0,0 +1,34 @@
+# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
+
+name: ParseOther
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 8
+      uses: actions/setup-java@v4
+      with:
+        java-version: '8'
+        distribution: 'temurin'
+        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+        settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - name: Publish to GitHub Packages Apache Maven
+      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
+      env:
+        GITHUB_TOKEN: ${{ github.token }}

From dfab53f85110762cce2bbbc981626e772721f264 Mon Sep 17 00:00:00 2001
From: juancruzdal <35972023+juancruzdal@users.noreply.github.com>
Date: Wed, 7 May 2025 01:54:00 -0300
Subject: [PATCH 5/5] Delete .github/workflows/maven-publish.yml

---
 .github/workflows/maven-publish.yml | 34 -----------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 .github/workflows/maven-publish.yml

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
deleted file mode 100644
index 267ad25..0000000
--- a/.github/workflows/maven-publish.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
-
-name: ParseOther
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 8
-      uses: actions/setup-java@v4
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
-      env:
-        GITHUB_TOKEN: ${{ github.token }}