Skip to content

Removed getItemInHand call and added nickname_hex_stripped placeholder #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Removed getItemInHand call and added nickname_hex_stripped placeholder #36

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47b68b0
Added nickname_hex_stripped placeholder
KingCreator11 Sep 23, 2021
a751551
Removed deprecated method use
KingCreator11 Sep 23, 2021
c0e60db
Switched indentation from tabs to spaces for consistency
KingCreator11 Sep 23, 2021
ab2e612
Fixed hex nick strip bug
KingCreator11 Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Copy link
Member

@iGabyTM iGabyTM Oct 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cache this regex

case "godmode":
return user.isGodModeEnabled() ? papiTrue : papiFalse;
case "unique":
Expand Down