Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-19 15:09:19 +00:00
Code Issues Releases Activity

fix: color being passed to item cosmetic from previous cosmetic

Browse Source
This commit is contained in:
LoJoSho
2025-01-31 12:18:02 -06:00
parent 28034318ac
commit b516cfced4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java
View File

@@ -15,8 +15,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.*; import org.bukkit.inventory.meta.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
public class DyeMenu { public class DyeMenu {
@@ -27,7 +26,7 @@ public class DyeMenu {
addCosmetic(user, cosmetic, null); addCosmetic(user, cosmetic, null);
return; return;
} }
ItemStack originalItem = user.getUserCosmeticItem(cosmetic); ItemStack originalItem = cosmetic.getItem();
if (originalItem == null || !cosmetic.isDyable()) return; if (originalItem == null || !cosmetic.isDyable()) return;
Gui gui = HMCColorApi.createColorMenu(player); Gui gui = HMCColorApi.createColorMenu(player);
@@ -65,7 +64,7 @@ public class DyeMenu {
gui.open(player); 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(); Player player = user.getPlayer();
user.addPlayerCosmetic(cosmetic, color); user.addPlayerCosmetic(cosmetic, color);
player.setItemOnCursor(new ItemStack(Material.AIR)); player.setItemOnCursor(new ItemStack(Material.AIR));