From 47b68b09823c9b830b890de952b66dcd51687a92 Mon Sep 17 00:00:00 2001 From: KingCreator11 Date: Thu, 23 Sep 2021 15:07:24 -0400 Subject: [PATCH 1/4] Added nickname_hex_stripped placeholder --- .../papi/expansion/essentials/EssentialsExpansion.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java index 89ce2b1..dfb47dc 100644 --- a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java @@ -263,6 +263,8 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) { return user.getNickname() != null ? essentials.getUser(player.getUniqueId()).getNickname() : player.getName(); case "nickname_stripped": return ChatColor.stripColor(user.getNickname() != null ? essentials.getUser(player.getUniqueId()).getNickname() : player.getName()); + case "nickname_hex_stripped": + return user.getNickname() != null ? user.getNickname().replaceAll("\\&#[0-9a-f]{6,}", "") : player.getName(); case "godmode": return user.isGodModeEnabled() ? papiTrue : papiFalse; case "unique": From a7515518c695d736634d1bfa2aadb27e446a7381 Mon Sep 17 00:00:00 2001 From: KingCreator11 Date: Thu, 23 Sep 2021 15:13:58 -0400 Subject: [PATCH 2/4] Removed deprecated method use --- .../papi/expansion/essentials/EssentialsExpansion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java index dfb47dc..96539f6 100644 --- a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java @@ -224,8 +224,8 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) { Player oPlayer = player.getPlayer(); if (oPlayer == null) return ""; - if (oPlayer.getItemInHand().getType() == Material.AIR) return ""; - item = oPlayer.getItemInHand(); + if (oPlayer.getInventory().getItemInMainHand().getType() == Material.AIR) return ""; + item = oPlayer.getInventory().getItemInMainHand(); } BigDecimal worth = essentials.getWorth().getPrice(essentials, item); From c0e60db66b214c8e4694e378063ae9753b40b9be Mon Sep 17 00:00:00 2001 From: KingCreator11 Date: Thu, 23 Sep 2021 15:14:36 -0400 Subject: [PATCH 3/4] Switched indentation from tabs to spaces for consistency --- .../papi/expansion/essentials/EssentialsExpansion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java index 96539f6..616b428 100644 --- a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java @@ -225,7 +225,7 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) { if (oPlayer == null) return ""; if (oPlayer.getInventory().getItemInMainHand().getType() == Material.AIR) return ""; - item = oPlayer.getInventory().getItemInMainHand(); + item = oPlayer.getInventory().getItemInMainHand(); } BigDecimal worth = essentials.getWorth().getPrice(essentials, item); From ab2e612eb628e66120914d322d9bf89415e9280d Mon Sep 17 00:00:00 2001 From: KingCreator11 Date: Thu, 23 Sep 2021 16:03:26 -0400 Subject: [PATCH 4/4] Fixed hex nick strip bug --- .../papi/expansion/essentials/EssentialsExpansion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java index 616b428..6b27b72 100644 --- a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java @@ -263,8 +263,8 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) { return user.getNickname() != null ? essentials.getUser(player.getUniqueId()).getNickname() : player.getName(); case "nickname_stripped": return ChatColor.stripColor(user.getNickname() != null ? essentials.getUser(player.getUniqueId()).getNickname() : player.getName()); - case "nickname_hex_stripped": - return user.getNickname() != null ? user.getNickname().replaceAll("\\&#[0-9a-f]{6,}", "") : player.getName(); + case "nickname_hex_stripped": + return user.getNickname() != null ? user.getNickname().replaceAll("§x§[0-9a-f]§[0-9a-f]§[0-9a-f]§[0-9a-f]§[0-9a-f]§[0-9a-f]", "") : player.getName(); case "godmode": return user.isGodModeEnabled() ? papiTrue : papiFalse; case "unique":