First Person Exclusions fixed. Ibodan saves the day once again.

xyonico · Dec 2, 2018 · 8ba0510 · 8ba0510
1 parent c77a346
commit 8ba0510
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CustomAvatar/FirstPersonExclusion.cs b/CustomAvatar/FirstPersonExclusion.cs
@@ -29,12 +29,12 @@ private void OnDisable()
 			Plugin.Instance.FirstPersonEnabledChanged -= OnFirstPersonEnabledChanged;
 		}
 
-		private void OnFirstPersonEnabledChanged(bool firstPersonEnabled)
+		public void OnFirstPersonEnabledChanged(bool firstPersonEnabled)
 		{
 			for (var i = 0; i < Exclude.Length; i++)
 			{
 				var excludeObject = Exclude[i];
-				excludeObject.layer = firstPersonEnabled ? AvatarLayers.OnlyInThirdPerson : _startLayers[i];
+				excludeObject.layer = AvatarLayers.OnlyInThirdPerson;
 			}
 		}
 	}

diff --git a/CustomAvatar/PlayerAvatarManager.cs b/CustomAvatar/PlayerAvatarManager.cs
@@ -139,6 +139,8 @@ private void OnFirstPersonEnabledChanged(bool firstPersonEnabled)
 			if (_currentSpawnedPlayerAvatar == null) return;
 			AvatarLayers.SetChildrenToLayer(_currentSpawnedPlayerAvatar.GameObject,
 				firstPersonEnabled ? 0 : AvatarLayers.OnlyInThirdPerson);
+			foreach (var ex in _currentSpawnedPlayerAvatar.GameObject.GetComponentsInChildren<AvatarScriptPack.FirstPersonExclusion>())
+				ex.OnFirstPersonEnabledChanged(firstPersonEnabled);
 		}
 
 		private void SceneManagerOnSceneLoaded(Scene newScene, LoadSceneMode mode)