From 36f33b54af0502676bd446fb9781d3b113426939 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sat, 22 Apr 2023 16:27:05 -0500 Subject: [PATCH] fix: cosmetic null showing error --- .../hooks/placeholders/HMCPlaceholderExpansion.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 58a78119..b5dc9a8e 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 @@ -62,8 +62,9 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { } if (placeholderArgs.get(1) != null) { Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1)); + if (cosmetic == null) return "INVALID_COSMETIC"; Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot()); - if (cosmetic == null || currentCosmetic == null) return "false"; + if (currentCosmetic == null) return "false"; if (currentCosmetic.getId() == cosmetic.getId()) return "true"; return "false"; }