From afb44fc3a7b56382e48a24eb595da7ed25f6eeeb Mon Sep 17 00:00:00 2001
From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com>
Date: Sun, 24 Sep 2023 06:42:08 -0500
Subject: [PATCH] [AvatarScaleMod] Fix initial scale always acting like
 Setting_PersistantHeight was true.

---
 AvatarScale/AvatarScaling/AvatarScaleManager.cs     | 5 +----
 AvatarScale/AvatarScaling/Components/LocalScaler.cs | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/AvatarScale/AvatarScaling/AvatarScaleManager.cs b/AvatarScale/AvatarScaling/AvatarScaleManager.cs
index 856c832..0861fa2 100644
--- a/AvatarScale/AvatarScaling/AvatarScaleManager.cs
+++ b/AvatarScale/AvatarScaling/AvatarScaleManager.cs
@@ -82,10 +82,7 @@ public class AvatarScaleManager : MonoBehaviour
         _localAvatarScaler.OnAvatarInstantiated(playerSetup._avatar, playerSetup._initialAvatarHeight,
             playerSetup.initialScale);
 
-        if (Setting_PersistantHeight)
-            SetHeight(_lastTargetHeight);
-        else if (_lastTargetHeight > 0)
-            SetHeight(playerSetup._initialAvatarHeight);
+        SetHeight(Setting_PersistantHeight ? _lastTargetHeight : -1f);
     }
 
     public void OnAvatarDestroyed(PlayerSetup playerSetup)
diff --git a/AvatarScale/AvatarScaling/Components/LocalScaler.cs b/AvatarScale/AvatarScaling/Components/LocalScaler.cs
index 0baaf75..68146e4 100644
--- a/AvatarScale/AvatarScaling/Components/LocalScaler.cs
+++ b/AvatarScale/AvatarScaling/Components/LocalScaler.cs
@@ -32,6 +32,7 @@ public class LocalScaler : BaseScaler
         _targetHeight = initialHeight;
         _scaleFactor = 1f;
         
+        _isHeightAdjustedFromInitial = false;
         _legacyAnimationScale = Vector3.zero;
     }