diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java index 12f488f5..969fe373 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java @@ -40,11 +40,13 @@ public class CosmeticArmorType extends Cosmetic { } public ItemStack getItem(@NotNull CosmeticUser user) { - ItemStack cosmeticItem = user.getUserCosmeticItem(this); + return getItem(user, user.getUserCosmeticItem(this)); + } + + public ItemStack getItem(@NotNull CosmeticUser user, ItemStack cosmeticItem) { if (!(user.getEntity() instanceof HumanEntity humanEntity)) return null; if (Settings.getShouldAddEnchants(equipSlot)) { ItemStack equippedItem = humanEntity.getInventory().getItem(equipSlot); - MessagesUtil.sendDebugMessages("CosmeticArmorType - " + equippedItem.getEnchantments().values().toString()); cosmeticItem.addUnsafeEnchantments(equippedItem.getEnchantments()); } // Basically, if force offhand is off AND there is no item in an offhand slot, then the equipment packet to add the cosmetic 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 ce94a485..e4d8763c 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -221,7 +221,10 @@ public class CosmeticUser { if (cosmetic instanceof CosmeticBackpackType || cosmetic instanceof CosmeticBalloonType) return new ItemStack(Material.AIR); return getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmetic.getSlot())); } - if (cosmetic instanceof CosmeticArmorType || cosmetic instanceof CosmeticMainhandType || cosmetic instanceof CosmeticBackpackType) { + if (cosmetic instanceof CosmeticArmorType armorType) { + item = armorType.getItem(this, cosmetic.getItem()); + } + if (cosmetic instanceof CosmeticBackpackType || cosmetic instanceof CosmeticMainhandType) { item = cosmetic.getItem(); } if (cosmetic instanceof CosmeticBalloonType) {