Fix chat error

AlessioDP · Dec 20, 2023 · 3f15ca4 · 3f15ca4
1 parent 7e86125
commit 3f15ca4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/bukkit/src/main/java/com/alessiodp/parties/bukkit/utils/BukkitMessageUtils.java b/bukkit/src/main/java/com/alessiodp/parties/bukkit/utils/BukkitMessageUtils.java
@@ -5,15 +5,17 @@
 import com.alessiodp.parties.common.parties.objects.PartyImpl;
 import com.alessiodp.parties.common.players.objects.PartyPlayerImpl;
 import com.alessiodp.parties.common.utils.MessageUtils;
+import org.jetbrains.annotations.NotNull;
 
 public class BukkitMessageUtils extends MessageUtils {
 
 	public BukkitMessageUtils(PartiesPlugin plugin) {
 		super(plugin);
 	}
 
+	@NotNull
 	@Override
-	public String convertPlaceholders(String message, PartyPlayerImpl player, PartyImpl party, String emptyPlaceholder) {
+	public String convertPlaceholders(@NotNull String message, PartyPlayerImpl player, PartyImpl party, @NotNull String emptyPlaceholder) {
 		String ret = super.convertPlaceholders(message, player, party, emptyPlaceholder);
 		// PlaceholderAPI
 		if (player != null) {

diff --git a/common/src/main/java/com/alessiodp/parties/common/addons/external/LuckPermsHandler.java b/common/src/main/java/com/alessiodp/parties/common/addons/external/LuckPermsHandler.java
@@ -33,18 +33,19 @@ public void init() {
 		}
 	}
 
+	@NotNull
 	public static String parsePlaceholders(@NotNull String text, @NotNull PartyPlayerImpl player) {
-		String ret = null;
+		String ret = text;
 		if (active) {
-			Matcher matcher = PLACEHOLDER_PATTERN.matcher(text);
+			Matcher matcher = PLACEHOLDER_PATTERN.matcher(ret);
 			while (matcher.find()) {
 				String identifier = matcher.group(1);
 				switch (CommonUtils.toLowerCase(identifier)) {
 					case "%luckperms_prefix%":
-						ret = text.replace(identifier, hook.getPlayerPrefix(player.getPlayerUUID()));
+						ret = ret.replace(identifier, hook.getPlayerPrefix(player.getPlayerUUID()));
 						break;
 					case "%luckperms_suffix%":
-						ret = text.replace(identifier, hook.getPlayerSuffix(player.getPlayerUUID()));
+						ret = ret.replace(identifier, hook.getPlayerSuffix(player.getPlayerUUID()));
 						break;
 					default: // Nothing to do
 				}

diff --git a/common/src/main/java/com/alessiodp/parties/common/utils/MessageUtils.java b/common/src/main/java/com/alessiodp/parties/common/utils/MessageUtils.java
@@ -10,6 +10,7 @@
 import com.alessiodp.parties.common.parties.objects.PartyImpl;
 import com.alessiodp.parties.common.players.objects.PartyPlayerImpl;
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -21,11 +22,13 @@ public abstract class MessageUtils {
 	private static final int[] ROMAN_VALUES = { 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 };
 	private static final String[] ROMAN_LITERALS = { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I" };
 
-	public String convertPlaceholders(String message, PartyPlayerImpl player, PartyImpl party) {
+	@NotNull
+	public String convertPlaceholders(@NotNull String message, PartyPlayerImpl player, PartyImpl party) {
 		return convertPlaceholders(message, player, party, "");
 	}
 
-	public String convertPlaceholders(String message, PartyPlayerImpl player, PartyImpl party, String emptyPlaceholder) {
+	@NotNull
+	public String convertPlaceholders(@NotNull String message, PartyPlayerImpl player, PartyImpl party, @NotNull String emptyPlaceholder) {
 		String ret = message;
 		String replacement;
 		Matcher matcher = PLACEHOLDER_PATTERN.matcher(ret);