From 5a86d4cb4a922c6ef0e4c53bcd2e4de8d01ade75 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Wed, 8 Apr 2026 08:46:52 +0200
Subject: [PATCH] 1.21.9: Fix crash

---
 .../org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java  | 2 +-
 .../org/saturnclient/impl/cosmetics/HatFeatureRenderer.java    | 3 +++
 .../java/org/saturnclient/saturnclient/mixin/NameTagMixin.java | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
index 62f89b6..f2e74c8 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
@@ -337,7 +337,7 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     @Override
     public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
             float limbAngle, float limbDistance) {
-        if (state.invisible || !state.capeVisible
+        if (state.displayName == null || state.invisible || !state.capeVisible
                 || state.skinTextures.cape() != null) {
             return;
         }
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
index 4c4a3e0..35110ec 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
@@ -23,6 +23,9 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
     // @Override
     public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
             PlayerEntityRenderState state, float limbAngle, float limbDistance) {
+        if (state.displayName == null)
+            return;
+
         SaturnPlayer player = SaturnPlayer.get(state.displayName.getString());
 
         if (state.invisible || player == null || player.hat.isEmpty()) {
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
index 064c111..453eae1 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
@@ -35,6 +35,9 @@ public abstract class NameTagMixin<S extends EntityRenderState> {
     @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
     protected void renderLabelIfPresent(S state, MatrixStack matrices, OrderedRenderCommandQueue queue,
             CameraRenderState cameraRenderState, CallbackInfo ci) {
+        if (state.displayName == null)
+            return;
+
         UUID uuid = isSaturn(state);
 
         if (uuid != null) {