From aae8903644c449770fb8aa1587c197c966b1a18c Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 8 Nov 2013 09:23:46 +1300 Subject: [PATCH] Added override to wolf set/get health --- .../disguise/disguisetypes/watchers/WolfWatcher.java | 2 ++ src/me/libraryaddict/disguise/events/DisguiseEvent.java | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java index f746b80b..3237af60 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java +++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java @@ -13,6 +13,7 @@ public class WolfWatcher extends AgeableWatcher { return AnimalColor.values()[(Byte) getValue(20, (byte) 14)]; } + @Override public float getHealth() { return (Float) getValue(18, 8F); } @@ -58,6 +59,7 @@ public class WolfWatcher extends AgeableWatcher { sendData(16); } + @Override public void setHealth(float newHealth) { setValue(18, newHealth); sendData(18); diff --git a/src/me/libraryaddict/disguise/events/DisguiseEvent.java b/src/me/libraryaddict/disguise/events/DisguiseEvent.java index d0751239..0345bfe9 100644 --- a/src/me/libraryaddict/disguise/events/DisguiseEvent.java +++ b/src/me/libraryaddict/disguise/events/DisguiseEvent.java @@ -1,6 +1,5 @@ package me.libraryaddict.disguise.events; - import me.libraryaddict.disguise.disguisetypes.Disguise; import org.bukkit.entity.Entity; @@ -8,7 +7,6 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; - public class DisguiseEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -18,7 +16,6 @@ public class DisguiseEvent extends Event implements Cancellable { private Disguise disguise; private Entity disguised; - private boolean isCancelled; public DisguiseEvent(Entity entity, Disguise disguise) {