From 33d27d089d3d3d465b61fba3bc5a07c46432203e Mon Sep 17 00:00:00 2001 From: Zeshan Aslam Date: Thu, 22 Jun 2017 16:32:24 -0400 Subject: [PATCH] Added options to hide health --- config.yml | 12 +++++-- .../actionhealth/HealthUtil$1.class | Bin 1346 -> 1346 bytes .../zeshanaslam/actionhealth/HealthUtil.class | Bin 8603 -> 9324 bytes .../actionhealth/SettingsManager.class | Bin 5792 -> 6101 bytes plugin.yml | 2 +- .../zeshanaslam/actionhealth/HealthUtil.java | 32 ++++++++++++++++++ .../actionhealth/SettingsManager.java | 22 ++++++++++++ 7 files changed, 64 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index c345b23..45ee4aa 100644 --- a/config.yml +++ b/config.yml @@ -40,9 +40,9 @@ Half Health Icon: "&c\u2764" Empty Health Icon: "&7\u2764" # Set names. Case sensitive! -Name Change: false +Name Change: true Name: -- Cow = Kuh +- SNOWMAN = Snow Golem # ActionHealth will be disabled for any world names added below. Case sensitive! Disabled worlds: @@ -66,4 +66,10 @@ Blacklist: # Show the health of the entity that the player is looking at. Show On Look: false -Look Distance: 10 \ No newline at end of file +Look Distance: 10 + +# Check if player can see entity before sending health. +Can See: true + +# Hide if action health if entity has invisible potion on. +Invisible Potion: true \ No newline at end of file diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class index 407eda4c597f23931098a4ee0af592baeb382cdf..b90eed64b0c7e8303715a6a8fa7cd8e69c50f31c 100644 GIT binary patch delta 31 mcmX@ab%<+2H4CHV<26+Ze28GFASo{EhAO{}+ diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class index d5b436ed75ed08c6d1ae5470648547187af7148d..b66b363e207606950921dace1f38ef1775ca2340 100644 GIT binary patch literal 9324 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 diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/SettingsManager.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/SettingsManager.class index 9e949d5b4f3395faa7c01e2d120a2d5872535eba..cfc81b2dea05686c245ae6e3ffe71c0b66129a9a 100644 GIT binary patch delta 2854 zcmY*b3wTt;75>lNP43O^glrx{!pl`22?-$y1PI|3^1zT6F##bU#GB-16WHv=>=Go_ zu2!p6Y>VC2Hnvr0t3gX!Eo4o=TD320rPj8zweOd0X{&u}ixxa*mb9?@?fmDT`RB}; znRDjb!^LMxVlSLO`80rX3VYCpBPKrOfq^4w2;kEuKI1`3k~}Ouk4Q7-#Zf#e1COTR zF?`m8WB8mGpT`%(dfdVjUVIV9MS8-+f^iE851zz?^h{bfDdd!pr!2(2B*xPgzAX5R zg=Ynyv+xzcuUhz;;MXmDL-2VE-xPeo!nXupv~b$Ox5eR064iIScp2Z7=6fc-Z{dsw zrTBq_`a=spvha#T_+#1VPdxZ3e&#{!=lF$q`lW?miTKyj{Kmp>1z)xBI~n}Fg+Is| zXNCOH!k=WVKWFi={oRXy;GZ7+3vY<^rip*c*ncdX6YX0T-j<2~6>{Fh1rOSYqe*^p znAH<`$sm_SZq`tWMX7?OMV3WrVtOp{TBO8Gw`iJRhDAQXOb=yIwn;fAT@gP@v4YfY zJJjwtgpB^saDSw~E9kU_qy6C!Aw4qabVu!Ic&Ittb9}yW#4vf>` zD^2n%x{9t=G>_)T52ehAEl{+O@)hnuP*DLbB224y>|nId-|R#pcEB;IP*D*cROrVZ z4t#6G@wYld1O1T*#~o3$Sf=kqkYKg2Q@#~q zVd?d>IRSR&Zyjz`7}P!O(V_l9e~UffDBLJLzK#2WLI1_rHg$(X3d0hRuig&!Uf#c7 z`ZMbW2BQZqAGk>dyyDbf(`SbQ4pqUe*PvorqNs#Q`MedC(NaarsGPm)lMb@BL?Q|W z2rmCxzrrC}u4o0VjK7+iAFH5MiYjTfNoy3XrFAB)S5!qC6mF9h#dS5+D5|A8f;n8) zS<%^6rf4JObFwjA*{Sdz*YcSy$4s)Kg--e7+us;Hhe zactG$a5NGfvf~F$?}7#&HD;tzlaH^8nyJO4&5By-T9euowbK?wTj{#^DKoEp8*L{j zeK(s!{-$tvufpxJLb}-gT3*2pb@SRCv_s(zyqAz4zt25qwhV9S8*=O(g@d?P(N4PF zq+N=3Q)hgGm7Q~!>^6;^)`e_NZH4z?PrT1s;kujgh*coFudzdZE&+vzEa}@cRR{iL zAt*$pe_H!gHE=%luzDYYCf%UOrmo{JTQ|8~-P99rN-uH+$T>ceUT=7N6$Oa5@<}`x zKb^6h2I4N?SqjBp^EJf+{GtFeL6XF5ktD1}PE?JYof>06taU+RB4-=#gix|G&3wAjG};z62dbmZ7I$w zOJHfGTXvY|b}h|wyO$=gY}?p{GfA)IJUccHE6J8K8;6@Wy&{2?2~;GoY8;h?JiStW zS*sIRk?T105bGw72BgQ-D7aO#<4+%SDir3D6*6OnebL?$9O#!)M`N; z@1GT=>>=%9hiqsg;UumBCQ)x-0-Gk$VDOe2C(&eJn-(@}*VReaOxSfxl59?(bsX2S z%a&0TokCkj(UWK|O3T5P1g>i?V*lHSFI0{3RU5p2CGoUquiLd(U(yj1zUmG=u;bF5 zFyVonV@NB^x}FWK*mbFb2`hGMMJF3t!AJN1(_q3O+hZ|44mTTG(RHbU2`jqgyjak! z1wEGvn6SXPC~%(OOn2b}+@8mJZWqCg*~q{gF8R4wfO-61p$Mz67}Y37BbK0zdt$v< z#;?r^F1eLFxdI<&$x&4D0jGakWy;}}Ma3EXTvk6Vn>xYc+Cw;5+~yYV{i zG|u5Jmj`#dGPu@1$onrx3J2-KA>0Qyhn$NK@vGqCMLme)!~81n6M)!9a6gO1{3t%g zFT^O5I!wQSUKl1GF!@06HXbwaiE}7^6Wh73hJP1WHZ?9tbKMnhp&>1IRtkUJ^7VP- z8BRVrDATVHVEPtvh4nrz)8(=@@?%6ycIcRuwoM(W+~z}Cc9`Tf^MI(2f_%t%c#XMe MUuVr<@K^lp9V#hl{r~^~ delta 2585 zcmY*a3w)E+75|^FNxz%qmZYIjN(JMiv?ML1rKP33`@j~OQp%$|gf=Z7Z6RrD5>U3e zZ_er5%U4iWxB1wHow_Ls2^5@j51n&QH*s&axhH$M&24Vt?9RObAMG#qfBxs5bMCq4 zo|BxezOTxD?v0aA0;r=tHzK&p#K+w*aF+}H7&mdZ8_pd0gwlLcEuZq>9^C7~eYoF^ zPvbKld=`h5^nk#G2cN@(%IYCE8$2xVc{jd*N0jDKfg_4MrpV(0M-|$~1Tsp<3LIB> zLSRziNr6)epAh(>!Y2j3r0^+$FDv|tz*hynrUE{#5_-miuj5&@e8a?Z0^f9_8sAds ze_P-?0^d~`eox);c{jd~AGq-XPP<_D<3)iVD&rri<;Ma)QTS7VpQ&ShE^tPj@e4(M zDexjQo=Faqoav{@J{mXfF-&IpCYk9X=dQWe zkswUp8#xfE-k%zYRawZBk|Fsq>GgQZdiP|jl=P)1L639#2&>x zn)8tdt%SsoQWdmXOfLkN7*zbpkDrR7;B_)logcJW$iu z*w<4dX)zTOoJ9-qSYofOKPE3No}--Q1n*Uw8W!P zYcR!im2?HQ6Qq8P^`n8#czmD4L3Mb6k^`-Lcw}^t)9RqL67Ryh3FU+FbdM-+xDM}^ zw2nGW3QOvu_1qx2JG}LV*Q#Q;IB?r&WPmS+_i~w!h{bs}<5^MRF{xY92I?VHrn|+Q z^b-#6(HmSHj=YVuDgAswD6gM3ADt>_H#}P;_0kTBG!CVEeD$<5eUtC3V;7+;ea2Uu zt}e_^-(FbBBOc+AD+Z~iWQkP&Y2?1s$jzpa`%5Etl}7F*ja+(-+(H_;Wi)b!XyifT zs8_LUAi)w3+?#yA%_0xqn+j#X9ibihy)|-qHF7aE@|?cIo{OgSTq})SD~&vej0W3s z<$1jxa1tHoz6vF#NHVQMQp#nPBRBzx;~4=Su|wPn8A`DyDw26e^VAq9sOA>yP)+i&tk>h z@ao-_ERVx_C~AIJtRI{#K}urPSchUJW`XcIiod*X>;KgkIFGU#wHWs1+OE4eJ2x1*7(Z@fsG1T(c$0B?X zbvVS1_hT_0K?6>q5zn&qX*A&_EXB)MhI3d>bFhNSu#)PriW<>MZCFD+=%4|trEAbh z_|!c9Dgc^uD;58=Z+h&*=q z2tLZTO8OXX=Apa=u(1-pDZaE};#L#40k7jB6Su#Hs#md&V VN!$3He$8AN|AuXTi{Ih*{|Ck9CFuYF diff --git a/plugin.yml b/plugin.yml index 6489331..ab82b46 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: ActionHealth main: com.zeshanaslam.actionhealth.Main -version: 3.1.7 +version: 3.1.8 softdepend: [MVdWPlaceholderAPI] commands: Actionhealth: diff --git a/src/com/zeshanaslam/actionhealth/HealthUtil.java b/src/com/zeshanaslam/actionhealth/HealthUtil.java index 34c10c6..9ad2bde 100644 --- a/src/com/zeshanaslam/actionhealth/HealthUtil.java +++ b/src/com/zeshanaslam/actionhealth/HealthUtil.java @@ -4,9 +4,11 @@ import be.maximvdw.placeholderapi.PlaceholderAPI; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import org.bukkit.ChatColor; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; import java.lang.reflect.Field; @@ -21,6 +23,35 @@ public class HealthUtil { } public void sendHealth(Player receiver, LivingEntity entity, double health) { + if (plugin.settingsManager.canSee) { + + if (entity instanceof Player) { + Player player = (Player) entity; + + if (!receiver.canSee(player)) { + return; + } + } + } + + if (plugin.settingsManager.spectatorMode) { + + if (entity instanceof Player) { + Player player = (Player) entity; + + // Using string version for older versions + if (player.getGameMode().name().equals("SPECTATOR")) { + return; + } + } + } + + if (plugin.settingsManager.invisiblePotion) { + if (entity.hasPotionEffect(PotionEffectType.INVISIBILITY)) { + return; + } + } + if (plugin.settingsManager.delay) { new BukkitRunnable() { @@ -53,6 +84,7 @@ public class HealthUtil { if (plugin.settingsManager.blacklist.contains(name)) return null; + System.out.println(entity.getName()); if (plugin.settingsManager.stripName) name = ChatColor.stripColor(name); if (plugin.settingsManager.translate.containsKey(entity.getName())) name = plugin.settingsManager.translate.get(entity.getName()); diff --git a/src/com/zeshanaslam/actionhealth/SettingsManager.java b/src/com/zeshanaslam/actionhealth/SettingsManager.java index a54a6c3..76960e1 100644 --- a/src/com/zeshanaslam/actionhealth/SettingsManager.java +++ b/src/com/zeshanaslam/actionhealth/SettingsManager.java @@ -19,6 +19,9 @@ public class SettingsManager { public boolean checkPvP; public boolean stripName; public boolean rememberToggle; + public boolean canSee; + public boolean invisiblePotion; + public boolean spectatorMode; public String filledHeartIcon; public String halfHeartIcon; public String emptyHeartIcon; @@ -40,6 +43,7 @@ public class SettingsManager { worlds.clear(); regions.clear(); blacklist.clear(); + translate.clear(); if (plugin.taskID != -1) Bukkit.getScheduler().cancelTask(plugin.taskID); @@ -114,5 +118,23 @@ public class SettingsManager { } else { disableMessage = "&7ActionHealth has been &cdisabled&7."; } + + if (plugin.getConfig().contains("Can See")) { + canSee = plugin.getConfig().getBoolean("Can See"); + } else { + canSee = true; + } + + if (plugin.getConfig().contains("Invisible Potion")) { + invisiblePotion = plugin.getConfig().getBoolean("Invisible Potion"); + } else { + invisiblePotion = true; + } + + if (plugin.getConfig().contains("Spectator Mode")) { + spectatorMode = plugin.getConfig().getBoolean("Spectator Mode"); + } else { + spectatorMode = true; + } } }