diff options
| author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2023-08-31 20:21:30 -0400 |
|---|---|---|
| committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2023-08-31 20:40:44 -0400 |
| commit | aa2abcf644bf58adb3330e87d870ce56a09ce3f5 (patch) | |
| tree | f9e9114f9b0031ce61dcfba05a030453f540d6b1 /src/main/java/me/xmrvizzy/skyblocker/skyblock/item | |
| parent | fea919794608128b6c436f1a64d1be38e935241d (diff) | |
| parent | 1370097922f19815e14bdfd8c9e606cde2bc8f39 (diff) | |
| download | Skyblocker-aa2abcf644bf58adb3330e87d870ce56a09ce3f5.tar.gz Skyblocker-aa2abcf644bf58adb3330e87d870ce56a09ce3f5.tar.bz2 Skyblocker-aa2abcf644bf58adb3330e87d870ce56a09ce3f5.zip | |
Merge branch 'master' into utils-cleanup
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
# src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
# src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
# src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
# src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/item')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java | 7 |
1 files changed, 6 insertions, 1 deletions
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); } } |