From 93bfa6a5ff72016c2cfdc26de94878b6690c0c19 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Mon, 18 Sep 2023 22:15:05 +0200
Subject: [PATCH] Don't reload all block shape caches on early init (mod
 compat)

Fixed https://github.com/ViaVersion/ViaFabricPlus/issues/245
---
 .../viafabricplus/definition/ClientsideFixes.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java b/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java
index d311f969..2c442de2 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/ClientsideFixes.java
@@ -105,8 +105,10 @@ public class ClientsideFixes {
         // Reloads some clientside stuff when the protocol version changes
         ChangeProtocolVersionCallback.EVENT.register(protocolVersion -> {
             // Reloads all bounding boxes
-            for (Block block : RELOADABLE_BLOCKS) {
-                block.getDefaultState().initShapeCache();
+            if (MinecraftClient.getInstance() != null && MinecraftClient.getInstance().player != null) { // Make sure that the game is loaded when reloading the cache
+                for (Block block : RELOADABLE_BLOCKS) {
+                    block.getDefaultState().initShapeCache();
+                }
             }
 
             // Calculates the current chat limit, since it changes depending on the protocol version