From 8e5b3d098cb588448156cdf474b506b370c933c1 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sat, 4 Feb 2023 18:02:29 -0600 Subject: [PATCH] placeholder current causing npe --- .../main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java index 3e743ae8..ba5cfe26 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/PAPIHook.java @@ -54,7 +54,9 @@ public class PAPIHook extends PlaceholderExpansion { } if (placeholderArgs.get(1) != null) { Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1)); - if (user.getCosmetic(cosmetic.getSlot()).getId() == cosmetic.getId()) return "true"; + Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot()); + if (cosmetic == null || currentCosmetic == null) return "false"; + if (currentCosmetic.getId() == cosmetic.getId()) return "true"; return "false"; } case "current":