diff --git a/ansible/files/paper-plugins/ProtocolLib-679.jar b/ansible/files/paper-plugins/ProtocolLib.jar
similarity index 100%
rename from ansible/files/paper-plugins/ProtocolLib-679.jar
rename to ansible/files/paper-plugins/ProtocolLib.jar
diff --git a/ansible/files/paper-plugins/civchat2-paper-2.2.2.jar b/ansible/files/paper-plugins/civchat2-paper-2.2.2.jar
index 0d0e0c789..fc3911376 100644
Binary files a/ansible/files/paper-plugins/civchat2-paper-2.2.2.jar and b/ansible/files/paper-plugins/civchat2-paper-2.2.2.jar differ
diff --git a/ansible/files/paper-plugins/namecolors-paper-2.0.0-SNAPSHOT.jar b/ansible/files/paper-plugins/namecolors-paper-2.0.0-SNAPSHOT.jar
index 2cff1f931..f31bc723d 100644
Binary files a/ansible/files/paper-plugins/namecolors-paper-2.0.0-SNAPSHOT.jar and b/ansible/files/paper-plugins/namecolors-paper-2.0.0-SNAPSHOT.jar differ
diff --git a/build.gradle.kts b/build.gradle.kts
index 09ec391aa..dc47579b9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,6 +34,7 @@ allprojects {
         maven("https://libraries.minecraft.net")
         maven("https://repo.codemc.io/repository/maven-public/")
         maven("https://repo.kryptonmc.org/releases")
+        maven("https://repo.dmulloy2.net/repository/public")
 
         maven("https://jitpack.io")
     }
diff --git a/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java b/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
index a0b7be0e0..433250d92 100644
--- a/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
+++ b/plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
@@ -77,7 +77,8 @@ public class CivChat2Listener implements Listener {
 			}
 		}
 
-		if (Bukkit.getPlayer(chatman.getChannel(playerJoinEvent.getPlayer())) == null) {
+		UUID player = chatman.getChannel(playerJoinEvent.getPlayer());
+		if (player != null && Bukkit.getPlayer(player) == null) {
 			chatman.removeChannel(playerJoinEvent.getPlayer());
 		}
 
diff --git a/plugins/namecolors-paper/build.gradle.kts b/plugins/namecolors-paper/build.gradle.kts
index 3aedb516a..2504d4395 100644
--- a/plugins/namecolors-paper/build.gradle.kts
+++ b/plugins/namecolors-paper/build.gradle.kts
@@ -12,5 +12,5 @@ dependencies {
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:namelayer-paper"))
     compileOnly(project(":plugins:civchat2-paper"))
-    compileOnly("me.neznamy:tab-api:3.0.2")
+    compileOnly("me.neznamy:tab-api:4.0.2")
 }
diff --git a/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java b/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java
index b3c56c2c2..939cb4c36 100644
--- a/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java
+++ b/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java
@@ -3,6 +3,7 @@ package com.biggestnerd.namecolors;
 
 
 import me.neznamy.tab.api.TabAPI;
+import me.neznamy.tab.api.TabPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -54,8 +55,13 @@ public class NameColors extends ACivMod implements Listener {
 			CivChat2.getInstance().getCivChat2Manager().removeCustomName(player.getUniqueId());
 			if(getServer().getPluginManager().isPluginEnabled("TAB")) {
 				//TAB is enabled, so lets reset the player name.
-				Bukkit.getScheduler().runTaskLater(this, () -> TabAPI.getInstance().getTablistFormatManager().resetName(TabAPI.getInstance()
-						.getPlayer(player.getUniqueId())), 20l );
+				Bukkit.getScheduler().runTaskLater(this, () -> {
+					TabPlayer tabPlayer = TabAPI.getInstance()
+							.getPlayer(player.getUniqueId());
+					if (tabPlayer != null) {
+						TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, null);
+					}
+				}, 20l );
 			}
 		} else {
 			if (color == NameColorSetting.RAINBOW_COLOR) {
@@ -64,8 +70,13 @@ public class NameColors extends ACivMod implements Listener {
 				if(getServer().getPluginManager().isPluginEnabled("TAB")) {
 					//TAB enabled, so now we need to re-apply this name as a "custom name"
 					//Side note: we do this temporarily so players if they lose their permission don't keep their colored name in TAB.
-					Bukkit.getScheduler().runTaskLater(this, () -> TabAPI.getInstance().getTablistFormatManager().setName(TabAPI.getInstance()
-							.getPlayer(player.getUniqueId()), rainbowify(player.getName())), 20);
+					Bukkit.getScheduler().runTaskLater(this, () -> {
+						TabPlayer tabPlayer = TabAPI.getInstance()
+								.getPlayer(player.getUniqueId());
+						if (tabPlayer != null) {
+							TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, rainbowify(player.getName()));
+						}
+					}, 20);
 				}
 				return;
 			}
@@ -74,8 +85,13 @@ public class NameColors extends ACivMod implements Listener {
 			//Same deal as for rainbow
 			if(getServer().getPluginManager().isPluginEnabled("TAB")) {
 				//We delay just in-case TAB hasn't loaded the player into memory yet.
-				Bukkit.getScheduler().runTaskLater(this, () -> TabAPI.getInstance().getTablistFormatManager().setName(TabAPI.getInstance()
-						.getPlayer(player.getUniqueId()),color + player.getName() + ChatColor.RESET), 20);
+				Bukkit.getScheduler().runTaskLater(this, () -> {
+					TabPlayer tabPlayer = TabAPI.getInstance()
+							.getPlayer(player.getUniqueId());
+					if (tabPlayer != null) {
+						TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, color + player.getName() + ChatColor.RESET);
+					}
+				}, 20);
 			}
 		}
 	}
diff --git a/plugins/simpleadminhacks-paper/build.gradle.kts b/plugins/simpleadminhacks-paper/build.gradle.kts
index eb40365c3..8cfbb3690 100644
--- a/plugins/simpleadminhacks-paper/build.gradle.kts
+++ b/plugins/simpleadminhacks-paper/build.gradle.kts
@@ -17,5 +17,5 @@ dependencies {
 	compileOnly(project(":plugins:bastion-paper"))
 	compileOnly(project(":plugins:exilepearl-paper"))
 
-	compileOnly("com.comphenix.protocol:ProtocolLib:4.8.0")
+	compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
 }