From 5ac1d9258a0db2e5031bb36819933409ed677d23 Mon Sep 17 00:00:00 2001
From: Zeshan Aslam <zeshan12aslam@gmail.com>
Date: Thu, 8 Aug 2019 12:20:59 -0400
Subject: [PATCH] Fixed error triggering health event

---
 src/com/zeshanaslam/actionhealth/LookThread.java          | 7 ++++++-
 src/com/zeshanaslam/actionhealth/Main.java                | 4 ++--
 src/com/zeshanaslam/actionhealth/api/HealthSendEvent.java | 8 ++++----
 .../actionhealth/support/LangUtilsSupport.java            | 5 ++---
 src/com/zeshanaslam/actionhealth/utils/HealthUtil.java    | 8 ++++----
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/com/zeshanaslam/actionhealth/LookThread.java b/src/com/zeshanaslam/actionhealth/LookThread.java
index 10c4745..c665ed7 100644
--- a/src/com/zeshanaslam/actionhealth/LookThread.java
+++ b/src/com/zeshanaslam/actionhealth/LookThread.java
@@ -46,7 +46,12 @@ public class LookThread extends BukkitRunnable {
                     String name = plugin.healthUtil.getName(livingEntity, player);
 
                     if (TargetHelper.canSee(player, livingEntity.getLocation(), transparentTypeIds) && !plugin.healthUtil.isBlacklisted(livingEntity, name)) {
-                        plugin.healthUtil.sendHealth(player, livingEntity, livingEntity.getHealth());
+                        Bukkit.getScheduler().runTask(plugin, new Runnable() {
+                            @Override
+                            public void run() {
+                                plugin.healthUtil.sendHealth(player, livingEntity, livingEntity.getHealth());
+                            }
+                        });
                         break;
                     }
                 }
diff --git a/src/com/zeshanaslam/actionhealth/Main.java b/src/com/zeshanaslam/actionhealth/Main.java
index fbf4b9d..53b25d4 100644
--- a/src/com/zeshanaslam/actionhealth/Main.java
+++ b/src/com/zeshanaslam/actionhealth/Main.java
@@ -59,9 +59,9 @@ public class Main extends JavaPlugin {
         if (Bukkit.getServer().getPluginManager().isPluginEnabled("MythicMobs")) {
             mythicMobsEnabled = true;
         }
-        
+
         if (Bukkit.getServer().getPluginManager().isPluginEnabled("LangUtils")) {
-        	langUtilsEnabled = true;
+            langUtilsEnabled = true;
         }
     }
 
diff --git a/src/com/zeshanaslam/actionhealth/api/HealthSendEvent.java b/src/com/zeshanaslam/actionhealth/api/HealthSendEvent.java
index 0a55720..b8fb4a9 100644
--- a/src/com/zeshanaslam/actionhealth/api/HealthSendEvent.java
+++ b/src/com/zeshanaslam/actionhealth/api/HealthSendEvent.java
@@ -21,6 +21,10 @@ public class HealthSendEvent extends Event implements Cancellable {
         this.isCancelled = false;
     }
 
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
     public Player getPlayer() {
         return player;
     }
@@ -37,10 +41,6 @@ public class HealthSendEvent extends Event implements Cancellable {
         this.message = message;
     }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
     @Override
     public HandlerList getHandlers() {
         return handlers;
diff --git a/src/com/zeshanaslam/actionhealth/support/LangUtilsSupport.java b/src/com/zeshanaslam/actionhealth/support/LangUtilsSupport.java
index 872f188..d92101e 100644
--- a/src/com/zeshanaslam/actionhealth/support/LangUtilsSupport.java
+++ b/src/com/zeshanaslam/actionhealth/support/LangUtilsSupport.java
@@ -1,16 +1,15 @@
 package com.zeshanaslam.actionhealth.support;
 
+import com.meowj.langutils.lang.LanguageHelper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import com.meowj.langutils.lang.LanguageHelper;
-
 public class LangUtilsSupport {
 
     public String getName(Entity entity, Player player) {
         return LanguageHelper.getEntityName(entity, player);
     }
-    
+
     public String getName(Entity entity, String locale) {
         return LanguageHelper.getEntityName(entity, locale);
     }
diff --git a/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java b/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
index 9fecd29..7ac6e22 100644
--- a/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
+++ b/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
@@ -187,11 +187,11 @@ public class HealthUtil {
 
         if (mcMMOName == null) {
             if (entity.getCustomName() != null) {
-            	name = entity.getCustomName();
-            } else if(plugin.langUtilsEnabled && plugin.configStore.useClientLanguage && receiver != null) {
-            	name = new LangUtilsSupport().getName(entity, receiver);
+                name = entity.getCustomName();
+            } else if (plugin.langUtilsEnabled && plugin.configStore.useClientLanguage && receiver != null) {
+                name = new LangUtilsSupport().getName(entity, receiver);
             } else {
-            	name = getNameReflection(entity);
+                name = getNameReflection(entity);
             }
         } else if (mcMMOName.equals("")) {
             name = getNameReflection(entity);