From 94cca060491122c9f7dfa8f4684ac6f52be510a1 Mon Sep 17 00:00:00 2001
From: Kevin <92656833+kevinthegreat1@users.noreply.github.com>
Date: Thu, 31 Aug 2023 20:02:20 -0400
Subject: Catch exceptions in CustomArmorTrims#initializeTrimCache (#262)

---
 .../me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/item')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
index ffc3f67d..6c648da9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -42,7 +42,10 @@ public class CustomArmorTrims {
 
 	private static void initializeTrimCache() {
 		ClientPlayerEntity player = MinecraftClient.getInstance().player;
-		if (!trimsInitialized && player != null) {
+		if (trimsInitialized || player == null) {
+			return;
+		}
+		try {
 			TRIMS_CACHE.clear();
 			DynamicRegistryManager registryManager = player.networkHandler.getRegistryManager();
 			for (Identifier material : registryManager.get(RegistryKeys.TRIM_MATERIAL).getIds()) {
@@ -62,6 +65,8 @@ public class CustomArmorTrims {
 
 			LOGGER.info("[Skyblocker] Successfully cached all armor trims!");
 			trimsInitialized = true;
+		} catch (Exception e) {
+			LOGGER.error("[Skyblocker] Encountered an exception while caching armor trims", e);
 		}
 	}
 
-- 
cgit