From f67c6dff54bea27680d9c5f830daf1a53190af47 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Sun, 27 Oct 2024 13:23:06 +1300
Subject: [PATCH] Fix wolf and cats having the wrong collar colors

---
 .../disguise/utilities/reflection/ReflectionManager.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
index a0ea99f4..406d6e74 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
@@ -1453,7 +1453,7 @@ public class ReflectionManager {
         } else if (index == MetaIndex.WOLF_VARIANT) {
             return (T) nmsReflection.getWolfVariantFromInt((int) value);
         } else if (index == MetaIndex.CAT_COLLAR || index == MetaIndex.WOLF_COLLAR) {
-            return (T) AnimalColor.getColorByDye((int) value);
+            return (T) AnimalColor.getColorByWool((int) value);
         } else if (index.isItemStack()) {
             return (T) DisguiseUtilities.toBukkitItemStack((com.github.retrooper.packetevents.protocol.item.ItemStack) value);
         } else if (index.isBlock() || index.isBlockOpt()) {
@@ -1556,7 +1556,7 @@ public class ReflectionManager {
         } else if (value instanceof Rabbit.Type) {
             return RabbitType.getTypeId((Rabbit.Type) value);
         } else if (index == MetaIndex.CAT_COLLAR || index == MetaIndex.WOLF_COLLAR) {
-            return (int) ((AnimalColor) value).getDyeColor().getDyeData();
+            return (int) ((AnimalColor) value).getDyeColor().getWoolData();
         } else if (value instanceof Enum && !(value instanceof SnifferState || value instanceof EntityPose || value instanceof BlockFace ||
             value instanceof ArmadilloState)) {
             int v = enumOrdinal(value);