From 1d2fd01a4baa81e23609d98fc2966839eb59a961 Mon Sep 17 00:00:00 2001
From: Zeshan Aslam <zeshan12aslam@gmail.com>
Date: Mon, 20 Mar 2017 15:54:21 -0400
Subject: [PATCH] Fixed incorrect health for delay option and health display
 values

Fixed:
- Delay option not getting the right health
- Showing negative health number when the entity dies
- Showing decimals
---
 .../actionhealth/HealthListeners.class        | Bin 4165 -> 4167 bytes
 .../actionhealth/HealthUtil$1.class           | Bin 932 -> 1247 bytes
 .../zeshanaslam/actionhealth/HealthUtil.class | Bin 7032 -> 7497 bytes
 plugin.yml                                    |   2 +-
 .../actionhealth/HealthListeners.java         |   4 +--
 .../zeshanaslam/actionhealth/HealthUtil.java  |  31 ++++++++++--------
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthListeners.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthListeners.class
index d73ab0a8002c374cd52bebe223a1c49344a569ae..37c0f0cc80fbc19c6386b7be965e06bf731374a2 100644
GIT binary patch
delta 241
zcmW-b%}N4c07cJ5b8>QKp}8}daTn#jl(H<ye$k*GTV$=G7PGN%Y4rfM_z>|S0znX3
zRg35ydXXSpG|ujF59e~fyl-!KZfkecu-}y&V37db8$Z>~J}-^2K1d%G-pGhg<_84k
zHFe{5$K<9ksveB*1nQa>=eG09jzm>S_Lbp49*6R&X_>kToT$jDN;FjCLUk^6MpG@W
zSpkljrOy>>tP|&l1<GtN!y|1rsSpcS?;;uty<9}&)3dBn4E-?KY_W|9lrT?j-pNl`
PwAh<-vVZuaq1)3xqbn{z

delta 238
zcmW-bze+-J0ENGUSFhdtIhalfUERXkQ^>4@qQ5F6*`PFqgMtw`R`dk%Bcz82B0*@X
z2I(DokcMdJdbh**_zvgGpZYJSo~q-P_pZ4SE-}!h%_WAJyTSzbgVfRL8w=u-^b<Y%
zoVYL(vNIMoS2l0@_Q7;-e%KN0D$c%A9B7F{`P5XPt`$yHq^S}u9do7{Z8hm=z&UF`
zgE%8PtW(C}n=Bhth;qv{n`{vYR=XjM1m0puo!L{0lmb6U9@|tAeL40%nK!vVmR<Jd
MP39MW{F;2!Kb8b6{{R30

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class
index 023caf5878f3377346362abc898d2c32541ff234..1a30a2513e2bc86c26c2c11f138190419e5e061e 100644
GIT binary patch
delta 461
zcmYLGO;5r=5PjPUwPn$w_<<-C1fhtuh&L}DG?B!_gNYXtlZI5p5DwCi=*7DxCQZ-Y
z`~yZ0DA6C_pYZChFwPbecQbD?J8x#*WFM6;wek7$_5olE4Hc8f3NQrZG^ohOu!@3)
z6%+-mDJUr@`(|}Y8#vv9+w(f!6@wAnN``;E!_NHCUT`O6g9LlFOpXfHIi@hpp&`b>
z5$Dj6Qc&gCK#jwK%~8iDgXzDQg1Gb$ZJNgn8S0YBGpKFX+jpI=cg`S}&0Pk~X|>#b
zzhK)o!>K>2u%?)9m<Jcmz_GecuWcQ9mz`dF`=4C5ZGU)DgF%a_w5_b`LJ>foM1`JY
zQbr=vkpRO?@GTW@W+{$R1f-B8oDUgE%wd5d(3_}ZbQg(1RrGd<NLZ1pynvBOe_nn?
ygyEhdd5Gu`$`g?#h!I-YHcbMT!!dl^0Ooj(jHQs8rZg}?Uy&gtqKwf-;rRucg+SE+

delta 358
zcmXX?O-lnY5PjLy#*MMN-B#;&t8Ueb&;@%g2zn3;9t80kik8Z<h~4(;AMmp5U+@nU
zJctLcf(OB0;6D*3(ZI}P^5(sH<lB7`t&gAAHvk>%xhP`Yqz#km5&{j0Rcs1u32bMF
z2cb97ad<OKbbLNe@5U)Z(7V+W-HvrKXkVoF!(@;>9<i(J^CbV`mAu2I^-!US9R-DX
zg;}@?5_1YA)D(8%<z?r+d)&HYkh<T$9*x2%iqIenf_!n`HynT}(QG9lLL7<`JTUlq
zP-s4ssV`CooFbsSXeX+uV1YWIY77w02&owsy>-DY!{2`fqi`tr3udN-IWUUSs+`fD
do>f(U^Z%+GOLlS@E9O$5-&&(ZhQ`Q@J--2#D`)@!

diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class
index 047182ee5d2ae93dc1dac3ef93f55a72dbba2e57..7b688787beba6082a5646f87bf9d85ef8a382a53 100644
GIT binary patch
delta 2935
zcma)7d32Q37609DzM1#UmzNMGOp?iDC4sDv1VSJKWobl+N+5ucShfL%B#=yEGND+k
z(^8I}qZX^LmPV`~ZH;wBgA<l&t+h~T>EhB-tI~b3Xlqw$)%3mzndH=RPUnw1_uc)z
z`+N7hSo=aCdgg-@&j6^QO*U5GE1G=OMhzZtGdJMIgZP>o58+{fM{Ec@s>x$E9><X+
zJb@=Q8Pw#cwtC7&3`3ebX5%<cXmV2E>ss=(g=cJ};Tsm7)&JkL@SKI{w>1B}g>UO1
zrvy&h$i)Mid`Ek|pt&=e`>rP6(+SR6_`W{;z`_r0%)pN{dC|g47GAdSidOyD!cQ!m
zv+z@aSGD?Q0<T$k-NG9-&g189`~tt!^60N@W`AwtH~6iE-&y#*ZvGDz-qhMZ+PHv|
z7Tywg+eSV9r0?U;Hr~NsZ2T2}v+;NQBMJY+#U%U-?`raIf%kL;@7uTrA0%OzAczRE
zAsi0%)OQ4XdqcehS9eEWYkQamZzKmf8cNrw*NpXr)IdmH6$x(Hu`JlVI=HzbL~yr;
zBFp<C-F*?ltda(`(a2Xl$zID02Rm8qQ6wj+Lx!myG)l7Foxxp8L&1(n8>i@sdvSI_
z1`lDd&9Q`%$iX+lm%$yWA@lWgG6gvac5us<P;YNhRaF&XLy5YHa#fYEjk$@0xyCM5
z8M~@AnK9;3tv#9(9_mGBweq-%a<(EQv6@^GE3rzDkYtftkS)0esZvE{l#(T-&;&uL
zk|vUetCW;RlO%a5T~dZ7nIr}IBxR9bQa0rX%9WHy`H~7~G9h()aA&ZxBN%S2TovhQ
z54TDxL@T$xTVKv6B^A*Wg0;IXekFXKO2vev-F!=JA$8m}DW!x;36NAq<%A5iPiAm}
z3YsQqIyhRTE}}|v)tbzpnd)khU09=&q)iWnBkhqJrq}lbw?$TT1aAoSNSZ~pl4jFn
zb*rdz%;8Q?iG_|j3MjW#oIh96Jo<>B`H~i3r=*3nNZ0gHLG_ZZpv7v1RhWAvE#c0(
z<MHad7&TiW?OkC>OQ}K7Rq9S_%ABkDTIm{ECa6);a#|s%NzzK<YhEqsT3RE>l(d$b
zd9;#Rs9e%@^fAJ0b;zBsQry0@b+lg621*ySQBn!z6N*)oa`ea@gj}`B$W=jijymXW
zq5{?wsAfBo;@leIst6nn+s02kn;r5D2Jr>CGB;&xD9eHxh|Zp_zVKFpS#o7*gL>P&
z)OPpsw7MI4MuV@~ONbiol3q1iK0Y`<`5lvls`B_;j<WKnV5;SwMN!-hCrsW_Gs}*`
zJPPMgxccEc3DHtkUNHnqi|rWPYX{&dD=*8r`50`L8$+Nc*v)~pOw&0Ckbz|Qkc}J^
zB9EVV0h(D_HWD5!xQ<Vp2<x!{j11;BMzIM-oDE_#2iwBD38OHDrHpbmTLTzxu`C&&
z?uz3`BJ8U*{rAG@n8!y+IE`dxk_n9iTv}Yzm}n-YAJ(*Em@p<u9Wjn!Vn4E?3B!cg
z^DNTFtS1GWKBvb!Er#?sm*GE#%+Z6-YmPf*#o+J9Sx<Jrm1@@tubFCh+)`)xZ>h7r
zrvD&5;Xi<#oIHnc4>}#S(koM=_F>G;v@@;Nl>PUiJkHhGCz0DSggl=shWtc<1$>BM
za=^7$4DXdRF#LR`owEM`ivFi{;W+DfDz7+<;t!cd^}ve~wmR%N?l()PjyHUS2Qo6_
zJ;-N%3fw5h1e79^Cp#Gx%vEA8s?daLwDC+MyyS1fEZl}#^kWXbj5-V;fQQ*?5c4pE
z`8b0Gco_@vMih(q^H5I?TtO}@Ac>`vh6Y{<S5XZbX+D<II{x2`mDGuA<AB=BSjgj|
zwxN~jSq|04*x}89@)3^HokBZnU7YkeY-g?D)F-e59k9577&@7=8BsgBM{!Br&=6!?
zGPf}f%Tii$DT$j}5oWE)-Mxn{4(*IXwFUBhz6|mVb1tVqHwj!X(8EzCRtz(Olg7!^
zqu%U^u5ki31k`zNUNk;#&(!hbF6M)$WMneOP}(@HJchD>d1-<kK8-;mZd;MC4Y)3E
z#X#05;)nr}fL3&RKTcfUr*h24y1Z4@n3daSd8*B)F{8!dNm~`e%z*84`)r@ZvYHmh
zXpC9xp{w?!){gkH>1^F)k~)~-SH&4=t4A*8!_CecOZI=4G+L0_m+@Grg(0zy(Ys!6
zA;!QaM0viq^HiVYv7O`9^Cq@Y27ineqK)d&PVLxEcVGuSgbsQMU38wOeF4|gMf4bi
zULze5qZl7I%Ft(&W2aGxUF!bKSCTJnJEID>qE&sy*R)<Qxs@=7IjqHS5cn)3L13T2
z9b6Uv?E{9H|8FJh$JA@!Nce(b_c@cXdnfKv)mdrDyvP@y<_-CX9<gf5nr7<NuJ&Y2
zjqYaL-w4U==HXNPEI-W;cMn!!FK^nL6AL@Qi(KLJ@zvct`b1cJH@?7W^7u*b#}|1=
z>sC@>@+<HO^b6cm@h*&13kPuT$nM5sexnYy5@mk<*`On;#GjM*rAr?Jf%`@t9XEau
p{4HSLL%3f}^w-QBZ!_}2&^E1{)xcqnXz*%j;(wbn3I6Bbe*iN@WDfuU

delta 2707
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
Ny#jkmyp7_&{{pi^IVu1E

diff --git a/plugin.yml b/plugin.yml
index 4e7ef37..00e16ce 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: ActionHealth
 main: com.zeshanaslam.actionhealth.Main
-version: 3.1.0
+version: 3.1.1
 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 208c6dc..7236ccb 100644
--- a/src/com/zeshanaslam/actionhealth/HealthListeners.java
+++ b/src/com/zeshanaslam/actionhealth/HealthListeners.java
@@ -63,7 +63,7 @@ public class HealthListeners implements Listener {
 
                 // Send health
                 LivingEntity livingEntity = (LivingEntity) damaged;
-                plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, livingEntity.getHealth() - event.getFinalDamage());
+                plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, (int) (livingEntity.getHealth() - event.getFinalDamage()));
 
             }
         }
@@ -92,7 +92,7 @@ public class HealthListeners implements Listener {
 
             // Send health
             LivingEntity livingEntity = (LivingEntity) damaged;
-            plugin.healthUtil.sendHealth(player, (LivingEntity) damaged, livingEntity.getHealth() - event.getFinalDamage());
+            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 23720ba..7b8ee39 100644
--- a/src/com/zeshanaslam/actionhealth/HealthUtil.java
+++ b/src/com/zeshanaslam/actionhealth/HealthUtil.java
@@ -19,9 +19,24 @@ public class HealthUtil {
         this.plugin = plugin;
     }
 
-    public void sendHealth(Player player, LivingEntity entity, double health) {
+    public void sendHealth(Player player, LivingEntity entity, int health) {
+        if (plugin.settingsManager.delay) {
+
+            new BukkitRunnable() {
+                public void run() {
+                    sendActionBar(player, getOutput((int) entity.getHealth(), entity));
+                }
+            }.runTaskLater(plugin, 1L);
+        } else {
+            sendActionBar(player, getOutput(Math.round(health), entity));
+        }
+    }
+
+    private String getOutput(int health, LivingEntity entity) {
         String name;
-        double maxHealth = entity.getMaxHealth();
+        int maxHealth = (int) entity.getMaxHealth();
+
+        if (health < 0) health = 0;
 
         if (entity.getCustomName() == null) {
             name = entity.getName();
@@ -67,17 +82,7 @@ public class HealthUtil {
             output = output.replace("{usestyle}", style);
         }
 
-        if (plugin.settingsManager.delay) {
-            String finalOutput = output;
-
-            new BukkitRunnable() {
-                public void run() {
-                    sendActionBar(player, finalOutput);
-                }
-            }.runTaskLater(plugin, 1L);
-        } else {
-            sendActionBar(player, output);
-        }
+        return output;
     }
 
     private void sendActionBar(Player player, String message) {