diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index f0324343..8574f4eb 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -626,7 +626,12 @@ public class CosmeticUser implements CosmeticHolder { if (isInWardrobe() && !ignoreWardrobe) { if (WardrobeSettings.isTryCosmeticsInWardrobe() && userWardrobeManager.getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return true; } - return getEntity().hasPermission(cosmetic.getPermission()); + final Player player = getPlayer(); + if (player != null) return player.hasPermission(cosmetic.getPermission()); + // This sucks, but basically if we can find a player, use that. If not, try to find the entity. If it can't find the entity, just return false. + final Entity entity = getEntity(); + if (entity != null) return entity.hasPermission(cosmetic.getPermission()); + return false; } public void hidePlayer() {