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..6b27b72 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); @@ -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("§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":