From 72e53e429c225c7fc70e70d16db76a1f7729c132 Mon Sep 17 00:00:00 2001
From: cervinakuy <16023430+cervinakuy@users.noreply.github.com>
Date: Fri, 7 Oct 2022 20:27:34 -0700
Subject: [PATCH] Added %uuid% placeholder to commands

---
 .../planetgallium/kitpvp/util/Toolkit.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/planetgallium/kitpvp/util/Toolkit.java b/src/main/java/com/planetgallium/kitpvp/util/Toolkit.java
index 9ef7c8a..7e2e5a3 100644
--- a/src/main/java/com/planetgallium/kitpvp/util/Toolkit.java
+++ b/src/main/java/com/planetgallium/kitpvp/util/Toolkit.java
@@ -97,7 +97,6 @@ public class Toolkit {
 		if (commands == null) return;
 
 		for (String commandString : commands) {
-
 			String[] commandPhrase = commandString.split(":", 2);
 
 			if (commandPhrase.length == 1) {
@@ -111,23 +110,25 @@ public class Toolkit {
 			String command = commandPhrase[1];
 
 			if (sender.equals("console")) {
-
-				Bukkit.dispatchCommand(Bukkit.getConsoleSender(), addPlaceholdersIfPossible(p, command.replace("%player%", p.getName()).replace(replaceFrom, replaceTo)));
-
+				Bukkit.dispatchCommand(Bukkit.getConsoleSender(),
+						replaceCommandPlaceholders(command, p, replaceFrom, replaceTo));
 			} else if (sender.equals("player")) {
-
-				p.performCommand(addPlaceholdersIfPossible(p, command.replace("%player%", p.getName()).replace(replaceFrom, replaceTo)));
-
+				p.performCommand(replaceCommandPlaceholders(command, p, replaceFrom, replaceTo));
 			} else {
-
 				Toolkit.printToConsole("&7[&b&lKIT-PVP&7] &cIncorrect command format. Please see: &fhttps://bit.ly/kp-command-format");
 				return;
-
 			}
-
 		}
 
 	}
+
+	private static String replaceCommandPlaceholders(String s, Player p, String replaceFrom, String replaceTo) {
+		String withPotentialPapiPlaceholders = addPlaceholdersIfPossible(p, s);
+		return withPotentialPapiPlaceholders
+				.replace("%player%", p.getName())
+				.replace("%uuid%", p.getUniqueId().toString())
+				.replace(replaceFrom, replaceTo);
+	}
  	
  	public static int versionToNumber() {