From 4481fa1c122cb0a29c3906cf62f441fef922f4b8 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Fri, 11 Aug 2023 09:36:55 -0500 Subject: [PATCH] fix: not returning causing NPE in equipped cosmetic placeholder --- .../hooks/placeholders/HMCPlaceholderExpansion.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java index 5c79060c..bfd46687 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java @@ -152,8 +152,9 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { return "INVALID_COSMETIC"; } } - if (user.getCosmetic(cosmetic.getSlot()) == null) TranslationUtil.getTranslation("equipped-cosmetic", "false"); - return TranslationUtil.getTranslation("equipped-cosmetic", String.valueOf(cosmetic.getId() == user.getCosmetic(cosmetic.getSlot()).getId())); + Cosmetic equippedCosmetic = user.getCosmetic(cosmetic.getSlot()); + if (equippedCosmetic == null) return TranslationUtil.getTranslation("equipped-cosmetic", "false"); + return TranslationUtil.getTranslation("equipped-cosmetic", String.valueOf(cosmetic.getId().equals(equippedCosmetic.getId()))); } case "wardrobe-enabled": return TranslationUtil.getTranslation("in-wardrobe", String.valueOf(user.isInWardrobe()));