From 78fba3e1f78b17fd12051cb3ef3991ee821b379f Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 21 Feb 2024 23:36:23 +1300 Subject: [PATCH] Fix wolf setAngry for versions older than 1.16, thanks FireworkPolymer --- .../disguisetypes/watchers/WolfWatcher.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java index 6a15459b..29acddbe 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java @@ -4,6 +4,7 @@ import me.libraryaddict.disguise.disguisetypes.AnimalColor; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; +import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsRemovedIn; import org.bukkit.DyeColor; @@ -45,19 +46,26 @@ public class WolfWatcher extends TameableWatcher { } public boolean isAngry() { + if (!NmsVersion.v1_16.isSupported()) { + return isTameableFlag(2); + } + return getAnger() > 0; - //return isTameableFlag(2); } public void setAngry(boolean angry) { - setAnger(angry ? 1 : 0); - //setTameableFlag(2, angry); + if (!NmsVersion.v1_16.isSupported()) { + setTameableFlag(2, angry); + } else { + setAnger(angry ? 1 : 0); + } } public int getAnger() { return getData(MetaIndex.WOLF_ANGER); } + @NmsAddedIn(NmsVersion.v1_16) public void setAnger(int anger) { setData(MetaIndex.WOLF_ANGER, anger); sendData(MetaIndex.WOLF_ANGER);