Avoid crash in AddLayers event for renderers of the wrong type (#556)

neoforged · Jan 23, 2024 · e64af6c · e64af6c
1 parent 98e85a4
commit e64af6c
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/main/java/net/minecraftforge/client/event/EntityRenderersEvent.java b/src/main/java/net/minecraftforge/client/event/EntityRenderersEvent.java
@@ -169,14 +169,19 @@ public Set<String> getSkins()
          *
          * @param skinName the name of the skin to get the renderer for
          * @param <R>      the type of the skin renderer, usually {@link PlayerRenderer}
-         * @return the skin renderer, or {@code null} if no renderer is registered for that skin name
+         * @return the skin renderer, or {@code null} if no {@link LivingEntityRenderer} is registered for that skin name
          * @see #getSkins()
          */
         @Nullable
         @SuppressWarnings("unchecked")
         public <R extends LivingEntityRenderer<? extends Player, ? extends EntityModel<? extends Player>>> R getSkin(String skinName)
         {
-            return (R) skinMap.get(skinName);
+            var entityRenderer = skinMap.get(skinName);
+            if (entityRenderer instanceof LivingEntityRenderer<?,?>) {
+                return (R)entityRenderer;
+            } else {
+                return null;
+            }
         }
 
         /**
@@ -185,13 +190,18 @@ public Set<String> getSkins()
          * @param entityType the entity type to return a renderer for
          * @param <T>        the type of entity the renderer is for
          * @param <R>        the type of the renderer
-         * @return the renderer, or {@code null} if no renderer is registered for that entity type
+         * @return the renderer, or {@code null} if no {@link LivingEntityRenderer} is registered for that entity type
          */
         @Nullable
         @SuppressWarnings("unchecked")
         public <T extends LivingEntity, R extends LivingEntityRenderer<T, ? extends EntityModel<T>>> R getRenderer(EntityType<? extends T> entityType)
         {
-            return (R) renderers.get(entityType);
+            var entityRenderer = renderers.get(entityType);
+            if (entityRenderer instanceof LivingEntityRenderer<?,?>) {
+                return (R)entityRenderer;
+            } else {
+                return null;
+            }
         }
 
         /**