From 4025f41ddf78a11e15ac7928d86c73f9489bcc97 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Wed, 16 Mar 2022 14:38:09 -0400
Subject: [PATCH] Fix avatar editor failing to load some parts

---
 .../avatar-editor/common/BodyModel.ts         | 42 ++++++++-----------
 .../AvatarEditorFigureSetItemView.tsx         |  2 +-
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/components/avatar-editor/common/BodyModel.ts b/src/components/avatar-editor/common/BodyModel.ts
index 437d44e6..d7170dbd 100644
--- a/src/components/avatar-editor/common/BodyModel.ts
+++ b/src/components/avatar-editor/common/BodyModel.ts
@@ -1,10 +1,10 @@
-import { AvatarEditorFigureCategory, AvatarScaleType, AvatarSetType, IAvatarImageListener } from '@nitrots/nitro-renderer';
+import { AvatarEditorFigureCategory, AvatarScaleType, AvatarSetType } from '@nitrots/nitro-renderer';
 import { GetAvatarRenderManager } from '../../../api';
 import { AvatarEditorUtilities } from './AvatarEditorUtilities';
 import { CategoryBaseModel } from './CategoryBaseModel';
 import { FigureData } from './FigureData';
 
-export class BodyModel extends CategoryBaseModel implements IAvatarImageListener
+export class BodyModel extends CategoryBaseModel
 {
     private _imageCallBackHandled: boolean = false;
 
@@ -43,31 +43,25 @@ export class BodyModel extends CategoryBaseModel implements IAvatarImageListener
 
         for(const part of category.parts)
         {
-            const figure = AvatarEditorUtilities.CURRENT_FIGURE.getFigureStringWithFace(part.id);
-            const avatarImage = GetAvatarRenderManager().createAvatarImage(figure, AvatarScaleType.LARGE, null, this);
-
-            const sprite = avatarImage.getImageAsSprite(AvatarSetType.HEAD);
-
-            if(sprite)
+            const resetFigure = (figure: string) =>
             {
-                sprite.y = 10;
-
-                part.thumbContainer = sprite;
-
-                setTimeout(() => avatarImage.dispose(), 0);
+                const figureString = AvatarEditorUtilities.CURRENT_FIGURE.getFigureStringWithFace(part.id);
+                const avatarImage = GetAvatarRenderManager().createAvatarImage(figureString, AvatarScaleType.LARGE, null, { resetFigure, dispose: null, disposed: false });
+    
+                const sprite = avatarImage.getImageAsSprite(AvatarSetType.HEAD);
+    
+                if(sprite)
+                {
+                    sprite.y = 10;
+    
+                    part.thumbContainer = sprite;
+    
+                    setTimeout(() => avatarImage.dispose(), 0);
+                }
             }
+
+            resetFigure(null);
         }
-
-        // if (this._Str_2271) this._Str_2271._Str_5614(k, _local_4.length);
-    }
-
-    public resetFigure(figure: string): void
-    {
-        if(this._imageCallBackHandled) return;
-
-        this._imageCallBackHandled = true;
-
-        this.updateSelectionsFromFigure(FigureData.FACE);
     }
 
     public get canSetGender(): boolean
diff --git a/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx b/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx
index cda9b8e4..12d9c153 100644
--- a/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx
+++ b/src/components/avatar-editor/views/figure-set/AvatarEditorFigureSetItemView.tsx
@@ -26,7 +26,7 @@ export const AvatarEditorFigureSetItemView: FC<AvatarEditorFigureSetItemViewProp
         {
             partItem.notify = null;
         }
-    })
+    }, [ partItem, rerender ]);
 
     return (
         <LayoutGridItem itemImage={ (partItem.isClear ? undefined : partItem.imageUrl) } itemActive={ partItem.isSelected } { ...rest }>