From b516cfced47ad8e3ab8be3ef91c1da7cccbd951f Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Fri, 31 Jan 2025 12:18:02 -0600 Subject: [PATCH] fix: color being passed to item cosmetic from previous cosmetic --- .../com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java index ddcdbe63..9486b4b7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java @@ -15,8 +15,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.*; import org.jetbrains.annotations.NotNull; - -import java.util.Objects; +import org.jetbrains.annotations.Nullable; public class DyeMenu { @@ -27,7 +26,7 @@ public class DyeMenu { addCosmetic(user, cosmetic, null); return; } - ItemStack originalItem = user.getUserCosmeticItem(cosmetic); + ItemStack originalItem = cosmetic.getItem(); if (originalItem == null || !cosmetic.isDyable()) return; Gui gui = HMCColorApi.createColorMenu(player); @@ -65,7 +64,7 @@ public class DyeMenu { gui.open(player); } - private static void addCosmetic(@NotNull CosmeticUser user, Cosmetic cosmetic, Color color) { + private static void addCosmetic(@NotNull CosmeticUser user, @NotNull Cosmetic cosmetic, @Nullable Color color) { Player player = user.getPlayer(); user.addPlayerCosmetic(cosmetic, color); player.setItemOnCursor(new ItemStack(Material.AIR));