From 60e23411dc63ce07448fbae55dac138f8d5c7a8c Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Wed, 2 Oct 2024 22:24:04 -0500 Subject: [PATCH] fix: fixed cosmetic applying owner skull npe? (Should have already been checked but is now fully checked) --- .../hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java | 2 +- .../com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index 93d6c8a3..bb213df2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -193,7 +193,7 @@ public class TypeCosmetic extends Type { } if (itemMeta instanceof SkullMeta skullMeta) { - if (skullMeta.hasOwner()) { + if (skullMeta.hasOwner() && skullMeta.getOwner() != null) { skullMeta.setOwner(Hooks.processPlaceholders(user.getPlayer(), skullMeta.getOwner())); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java index ead56dc7..447da1fd 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java @@ -75,7 +75,7 @@ public class TypeEmpty extends Type { } if (itemMeta instanceof SkullMeta skullMeta) { - if (skullMeta.hasOwner()) { + if (skullMeta.hasOwner() && skullMeta.getOwner() != null) { skullMeta.setOwner(Hooks.processPlaceholders(user.getPlayer(), skullMeta.getOwner())); } }