Fix for join spot settings being uhhh, bad

Wet-Boys · Feb 22, 2025 · d0b5d4e · d0b5d4e
1 parent 71d1c26
commit d0b5d4e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Version 1.15.11: Fixed issue where getting disconnected from a join spot caused desyncs.
+
 - Version 1.15.10: Fixed a longstanding bug where rotating in third person without moving would slightly rotate you on other people's screens. Fixed another longstanding bug where the first player slot had incorrect bonemapper scaling. Added internal stuff so that the third person mod works since people seem to really like the third person setup I use.
 
 - Version 1.15.9: Fixed VRM/ModelReplacementAPI models not scaling up/down correctly when assigning a parent game object. Literally no one uses this feature but I will soonTM

diff --git a/CustomEmotesAPI/CustomEmotesAPI.cs b/CustomEmotesAPI/CustomEmotesAPI.cs
@@ -51,7 +51,7 @@ public class CustomEmotesAPI : BaseUnityPlugin
 
         public const string PluginName = "Custom Emotes API";
 
-        public const string VERSION = "1.15.10";
+        public const string VERSION = "1.15.11";
         public struct NameTokenWithSprite
         {
             public string nameToken;
@@ -1074,6 +1074,12 @@ public static void ChangeInteractionTriggers(bool active)
                 }
             }
         }
+
+        internal static IEnumerator PlayNoneAfterFrame()
+        {
+            yield return new WaitForEndOfFrame();
+            PlayAnimation("none");
+        }
         internal static void Changed(string newAnimation, BoneMapper mapper) //is a neat game made by a developer who endorses nsfw content while calling it a fine game for kids
         {
             if (mapper is null)
@@ -1135,7 +1141,8 @@ public static void ChangeInteractionTriggers(bool active)
             }
             else if (localMapper.currentlyLockedBoneMapper == mapper && Settings.StopEmoteWhenLockedToStopsEmote.Value)
             {
-                PlayAnimation("none", localMapper);
+                localMapper.StartCoroutine(PlayNoneAfterFrame());
+                // PlayAnimation("none", localMapper);//why does this desync for clients? Idk this is such a niche use case, and I'm kinda done with making stuff at this point so this workaround is good enough for me.
             }
             foreach (var item in EmoteLocation.emoteLocations)
             {

diff --git a/LethalEmotesAPI.sln b/LethalEmotesAPI.sln
@@ -26,6 +26,7 @@ Global
 		{7EA1C941-92DD-4435-A3AC-87B885484C2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DED61D4A-8EA3-4662-ACF9-FFDDB59E8975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DED61D4A-8EA3-4662-ACF9-FFDDB59E8975}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DED61D4A-8EA3-4662-ACF9-FFDDB59E8975}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BD82460-7D0C-41EA-8ECC-8D67AD3372E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2BD82460-7D0C-41EA-8ECC-8D67AD3372E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BD82460-7D0C-41EA-8ECC-8D67AD3372E6}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/Unity-LethalEmotesApi-UI/Packages/LethalEmotesApi.Ui/LethalEmotesApi.Ui.dll b/Unity-LethalEmotesApi-UI/Packages/LethalEmotesApi.Ui/LethalEmotesApi.Ui.dll
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "LethalEmotesAPI",
-    "version_number": "1.15.10",
+    "version_number": "1.15.11",
     "website_url": "https://github.com/Wet-Boys/LethalEmotesAPI/",
     "description": "API for adding emotes to Lethal Company",
     "dependencies": [