From 7eeb126e86b0e2363b8016b4d91075b0eceda5cc Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Thu, 24 Nov 2022 19:18:50 -0600 Subject: [PATCH] Can now switch to new cosmetic in menu --- .../hmccosmetics/gui/type/types/TypeCosmetic.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index 0aa8dbb3..f7b06d32 100644 --- a/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -31,12 +31,14 @@ public class TypeCosmetic extends Type { try { if (!actionConfig.node("any").virtual()) actionStrings.addAll(actionConfig.node("any").getList(String.class)); - if (user.getCosmetic(cosmetic.getSlot()) == (cosmetic)) { + if (user.getCosmetic(cosmetic.getSlot()) == cosmetic) { if (!actionConfig.node("on-unequip").virtual()) actionStrings.addAll(actionConfig.node("on-unequip").getList(String.class)); HMCCosmeticsPlugin.getInstance().getLogger().info("on-unequip"); + user.removeCosmeticSlot(cosmetic); } else { if (!actionConfig.node("on-equip").virtual()) actionStrings.addAll(actionConfig.node("on-equip").getList(String.class)); HMCCosmeticsPlugin.getInstance().getLogger().info("on-equip"); + user.addPlayerCosmetic(cosmetic); } Actions.runActions(user, actionStrings); @@ -45,7 +47,7 @@ public class TypeCosmetic extends Type { throw new RuntimeException(e); } - user.toggleCosmetic(cosmetic); + //user.toggleCosmetic(cosmetic); user.updateCosmetic(cosmetic.getSlot()); } }