From 8ffbd2b074c7c77e7289d3d49a558cd26acb92ed Mon Sep 17 00:00:00 2001
From: Kikisito <bekikisito@gmail.com>
Date: Wed, 1 Dec 2021 00:03:18 +0100
Subject: [PATCH 1/2] 1.18+ support

---
 src/com/zeshanaslam/actionhealth/utils/HealthUtil.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java b/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
index 251ab92..9757b36 100644
--- a/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
+++ b/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
@@ -3,7 +3,7 @@ package com.zeshanaslam.actionhealth.utils;
 import com.zeshanaslam.actionhealth.Main;
 import com.zeshanaslam.actionhealth.api.HealthSendEvent;
 import com.zeshanaslam.actionhealth.support.*;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.lang3.text.WordUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -268,13 +268,13 @@ public class HealthUtil {
         message = ChatColor.translateAlternateColorCodes('&', message);
 
         try {
-            if (plugin.configStore.mcVersion.equals("v1_17_R1")) {
+            if (plugin.configStore.mcVersion.contains("v1_17") || plugin.configStore.mcVersion.contains("v1_18")) {
                 new NewAction(player, message);
-            } else if (plugin.configStore.mcVersion.equals("v1_16_R1") || plugin.configStore.mcVersion.equals("v1_16_R2") || plugin.configStore.mcVersion.equals("v1_16_R3")) {
+            } else if (plugin.configStore.mcVersion.contains("v1_16")) {
                 new PreAction(player, message);
             } else if (plugin.configStore.mcVersion.equals("v1_12_R1") || plugin.configStore.mcVersion.startsWith("v1_13") || plugin.configStore.mcVersion.startsWith("v1_14_") || plugin.configStore.mcVersion.startsWith("v1_15_")) {
                 new LegacyPreAction(player, message);
-            } else if (!(plugin.configStore.mcVersion.equalsIgnoreCase("v1_8_R1") || (plugin.configStore.mcVersion.contains("v1_7_")))) {
+            } else if (!(plugin.configStore.mcVersion.equalsIgnoreCase("v1_8_R1") || plugin.configStore.mcVersion.contains("v1_7_"))) {
                 Class<?> c1 = Class.forName("org.bukkit.craftbukkit." + plugin.configStore.mcVersion + ".entity.CraftPlayer");
                 Object p = c1.cast(player);
                 Object ppoc;

From 0fee3f660188cac3ab08df0e206fe116d1c519b6 Mon Sep 17 00:00:00 2001
From: Kikisito <bekikisito@gmail.com>
Date: Wed, 1 Dec 2021 00:09:29 +0100
Subject: [PATCH 2/2] Bump to 3.5.6

---
 plugin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.yml b/plugin.yml
index 68c13ca..01c65a2 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: ActionHealth
 main: com.zeshanaslam.actionhealth.Main
-version: 3.5.5
+version: 3.5.6
 softdepend: [PlaceholderAPI, MVdWPlaceholderAPI, WorldGuard, mcMMO, MythicMobs, LangUtils]
 api-version: 1.13
 commands: