From ce78bbc078e8d92a61f99c0aeae931eb2248c26c Mon Sep 17 00:00:00 2001
From: Zeshan Aslam <zeshan12aslam@gmail.com>
Date: Tue, 21 Mar 2017 11:30:18 -0400
Subject: [PATCH] Fixed casting error and checking if entity is dead

---
 .../actionhealth/HealthListeners.class        | Bin 4167 -> 4189 bytes
 .../zeshanaslam/actionhealth/HealthUtil.class | Bin 7487 -> 7497 bytes
 plugin.yml                                    |   2 +-
 .../actionhealth/HealthListeners.java         |  13 ++++++++-----
 .../zeshanaslam/actionhealth/HealthUtil.java  |   4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthListeners.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthListeners.class
index 37c0f0cc80fbc19c6386b7be965e06bf731374a2..35040933bb23e289e7f903816ec6aee2f8f61b8f 100644
GIT binary patch
delta 329
zcmXAk%`3xk9LHZDzu80fvo)Jo)TYc9yP!OjhmC_R6pM+&C?YaVtx3Y>q};v-&CMSm
zqLiDR-24M_@Gq=fgnXOp=k@OOet%v9?}59jsFu23Rh7^~vhLO4xW$GQq@;q*g73Wh
z5!*AK+2|8ZLIrP`yt;8FtQA_zgw&_AM~+m7Iro3)RQqO+aizhvxp4AEoDU}WWlHQM
z#Lcw$nUOALCCr@kF)#frN{qC`S(Y>_vP4EQtjY#!Qe>S$U>>{nv@^me^<1*a7~@zt
z<(Qc6Fm$@DMlHG{SEB|rONk+dwLrh4XG|hw#jDO5JIu&85gW+{)AvPK-8WwNwzPU1
n4?7I7tMyq@<W$PlZRj#pbnTgWohabvfGCIR#}%xRpgZ&j11dwh

delta 323
zcmW-cOG^S_6o#MUn3LqFXtsy~M<S5PU0^AdU7)fHT3FPgav@!@FhyE*S-0w2h(96<
zf}l;*s#g5~q5lwVf+%R3-3!k-&pGdV^d)-xDZ1zApm<WMs7F_qo^xVaeaPTl*7fG~
zHqr5bRF&zgM=q>;^d~}#i3h^MGo4M!>e@G}etnkIRNTm`bHmcE=u<aF;k3mBUrdWI
zBVOht%)CTd5R;q?ke37nNwFen)+EQe<k^r_HszQiL%<U4G}vN<QQWlXWsD4MoKa`o
zc5AkE&!L*V*W*z4|F;a20>2X{nL;RwM>YL1BlbgFC);5}zA@FS|1wgth1-PKA!*Ap
i?6Yi_+6`EmeO5IBhepMosM1Z11a%b-nhr?@`~LvgUqZ_O

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class
index 3a1692f15fabe9abb71eddfc246c5ddd8fb6c541..94ff399ec7ed9e2d1c62acde9fc2a84a5beb1326 100644
GIT binary patch
delta 816
zcmYjPOH5Ny5Iu+fUfWmsNNG!{P!ZcA1Vp4*K}AUvBbfM!0xDFk1uXc1upy+zn7A-8
zlIOz4L=!j0=mKe}V3CiK5SJ$IT)JatV%!;>f}(G6?wK<)_sq?kh0w>)gSLZKOd@5*
z3rt&(#+xjgv0xT&vyd@iE~~s#FmFL278ERI&m{%#6@19jWo6=C1=AC+uQ8MKax{l?
z$w#`Ex^9O`Ck0%znpmvT%@UO!ZZWY`Wf{FHx3Zkb8wihvYhvM{XwAuyoBcykmD>;{
zjAKLL!N|DE3T`KqvA#$+Hqs}tkA5v-@)!fGB%m#s{B&rmrgoNVjY@_-?Yr{SY**RI
zE+VLv8iEpZ^PI}_beMQSWq@A7r`@7Q>$O^vxt7u#o3VemH4?r|==_1MWR<$i<S$#y
z82<(xtN@3rW??1nH|X7up-P|<2^e%uLT$tfY(h2>9nWD|mpUp_(5GNXAvXb~dIov_
zl>GJLGzt<Z-l*G9H!q@ay|^*kZx0z<hJvE%G#qQp>7Ie>Z%}O4{};K_C`n+Yz@xeB
z9;#Z<ewa_RxcyYz?K1vpnFQofX9RDfOt1oG_~1kUUQ}WSs!)d-w4xSW*ohn1g>ls5
zE_UM~8t@E_c!fQ(H6f(17a25R9{cbK`|$+_@D(js#UUzar4{>`k0UHXTb%Vc${;$}
zg5&IwGlCPmj?*|RBiw-vei`ZtqJp2%j6Ph1g&`SdjfveN`Xy@=(>V-C)+E-`xGGGR
z6H|x@GiU!4I%RPAgoQ<uB@tHJgI?sIPVCoB%pAa=r1kQ;9~hFW4Y(v-U9kN`5jf>I
QMiy%A&J+uiIj&~?Z`qBZ^8f$<

delta 828
zcmYk4OH31C5Xb-1*KW64sjVx0Pzz`+6tEJtU<CmsQH)@GfgmcYVgXByNVpKi7!M{S
zMzR+hj2t`=!v$%nyp)F~XuNs!=E=mf@nB+fHXwMJ`OV{-|9rdO$Jk=*Ny8B<ULqr5
z8d;rQOPIl|Zsr8c>zM@+ZzQ<zR>Y$2mqaX!SkdvFi1#*3jtmEBdgRqDnoAeZfPv=I
zPmL4CW<{o4vI*pt$wOY5e3U1UU#1-tkSU)E2#y|gK#e5SWIS@VzppzPm#GkOf@LtN
z_IBQtX(#O>h=X07YNEf3;~?$Uo(q0kh>8f1shGmrvQR{d_FZVC0<BV<r=a#j9J7XH
zYNa+pg%&VZ@Fo|jU8YN<2y|Jd5CsS!?LPUn4x5zDkphNvwY)-7_nrDq^*X^=l>TME
zZ5jFoBWwWml+MCNcpNqPp22La;!q~6!p>kPG>t=AOErZvFlAuQU`q;O*$i?vGmf?9
zEVicL-RRrMI+x(uY~B_#d(4ear7Vl>Iy!TGGjRV4Jc{YR$eV>Pg;i%>%;J!uf?{$=
ziKys{S{0LT3<JJV^s%&Gt5uHCsP;%XH{|tL)<;bOe8(2H50K9`2rEL!K{4D2qY$M`
z5gfu^oJKjiun+y%k9#<PVMLKaC0^hl#u38=cTJ&+AJSobKn*^l7GF?@uQ-Z7s3!wz
zNW^inqhW|jaDw)ri7Ii5n%TGG48?IC7kGt-up_`r-9Vh}CsecSRY+8hk~LzvC3JJu
z!lDc4;i|yW)40hbvY$eN$*TW2w4#k?>ZEdxUky{_3OZmwG1aY$SV=`MmrZ=TpGfj(
dGp_NeR>;5kW2B|rlSD49#hoEnTJ}_%{sO^3qrd<F

diff --git a/plugin.yml b/plugin.yml
index 00e16ce..44be2dd 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: ActionHealth
 main: com.zeshanaslam.actionhealth.Main
-version: 3.1.1
+version: 3.1.2
 commands:
   Actionhealth:
     description: Actionhealth main command.
\ No newline at end of file
diff --git a/src/com/zeshanaslam/actionhealth/HealthListeners.java b/src/com/zeshanaslam/actionhealth/HealthListeners.java
index 7236ccb..5d99771 100644
--- a/src/com/zeshanaslam/actionhealth/HealthListeners.java
+++ b/src/com/zeshanaslam/actionhealth/HealthListeners.java
@@ -62,9 +62,10 @@ public class HealthListeners implements Listener {
                 }
 
                 // Send health
-                LivingEntity livingEntity = (LivingEntity) damaged;
-                plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, (int) (livingEntity.getHealth() - event.getFinalDamage()));
-
+                if (damaged instanceof LivingEntity) {
+                    LivingEntity livingEntity = (LivingEntity) damaged;
+                    plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, (int) (livingEntity.getHealth() - event.getFinalDamage()));
+                }
             }
         }
 
@@ -91,8 +92,10 @@ public class HealthListeners implements Listener {
             }
 
             // Send health
-            LivingEntity livingEntity = (LivingEntity) damaged;
-            plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, (int) (livingEntity.getHealth() - event.getFinalDamage()));
+            if (damaged instanceof LivingEntity) {
+                LivingEntity livingEntity = (LivingEntity) damaged;
+                plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, (int) (livingEntity.getHealth() - event.getFinalDamage()));
+            }
         }
     }
 
diff --git a/src/com/zeshanaslam/actionhealth/HealthUtil.java b/src/com/zeshanaslam/actionhealth/HealthUtil.java
index 7f53c3b..d10b968 100644
--- a/src/com/zeshanaslam/actionhealth/HealthUtil.java
+++ b/src/com/zeshanaslam/actionhealth/HealthUtil.java
@@ -36,7 +36,7 @@ public class HealthUtil {
         String name;
         int maxHealth = (int) entity.getMaxHealth();
 
-        if (health < 0) health = 0;
+        if (health < 0 || entity.isDead()) health = 0;
 
         if (entity.getCustomName() == null) {
             name = entity.getName();
@@ -69,7 +69,7 @@ public class HealthUtil {
                     }
                 }
 
-                if (tempHealth >= 0) {
+                if (tempHealth > 0) {
                     style = style + plugin.settingsManager.halfHeartIcon;
                     left--;
                 }