Skip to content

Commit

Permalink
2024.07.2b
Browse files Browse the repository at this point in the history
+ Fixed respawn issue
+ Changed when LowestPoint is set
  • Loading branch information
200Tigersbloxed committed Jul 11, 2024
1 parent 807eaad commit 07a4fc2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
Binary file modified Assets/Libs/Hypernex.CCK/Hypernex.CCK.Unity.dll
Binary file not shown.
6 changes: 3 additions & 3 deletions Assets/Scripts/Game/LocalPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ public IEnumerator SafeSwitchScene(string s, Action<Scene> onAsyncDone = null, A
if(onAsyncDone != null)
onAsyncDone.Invoke(currentScene);
yield return new WaitUntil(() => currentScene.isLoaded);
LowestPoint = AnimationUtility.GetLowestObject(currentScene).position;
if(onDone != null)
onDone.Invoke(currentScene);
LowestPoint = AnimationUtility.GetLowestObject(currentScene).position;
}

public IEnumerator SafeSwitchScene(int i, Action<Scene> onAsyncDone = null, Action<Scene> onDone = null)
Expand All @@ -179,9 +179,9 @@ public IEnumerator SafeSwitchScene(int i, Action<Scene> onAsyncDone = null, Acti
if(onAsyncDone != null)
onAsyncDone.Invoke(currentScene);
yield return new WaitUntil(() => currentScene.isLoaded);
LowestPoint = AnimationUtility.GetLowestObject(currentScene).position;
if(onDone != null)
onDone.Invoke(currentScene);
LowestPoint = AnimationUtility.GetLowestObject(currentScene).position;
}

// maybe we should cache an avatar instead? would improve speeds for HDD users, but increase memory usage
Expand Down Expand Up @@ -211,7 +211,7 @@ .SpawnPoints[new System.Random().Next(0, GameInstance.FocusedInstance.World.Spaw
searchSpawn = SceneManager.GetActiveScene().GetRootGameObjects()
.FirstOrDefault(x => x.name.ToLower() == "spawn");
else
searchSpawn = s.Value.GetRootGameObjects().FirstOrDefault(x => x.name.ToLower() == "Spawn");
searchSpawn = s.Value.GetRootGameObjects().FirstOrDefault(x => x.name.ToLower() == "spawn");
if (searchSpawn != null)
spawnPosition = searchSpawn.transform.position;
}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Init.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

public class Init : MonoBehaviour
{
public const string VERSION = "2024.07.1b";
public const string VERSION = "2024.07.2b";

public static Init Instance;
public static bool IsQuitting { get; private set; }
Expand Down
3 changes: 3 additions & 0 deletions Assets/Scripts/Tools/SecurityTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using UnityEngine.Rendering.Universal;
using UnityEngine.UI;
using UnityEngine.XR.Interaction.Toolkit.UI;
using UnityEngine.EventSystems;
using Object = UnityEngine.Object;
using Security = Hypernex.CCK.Unity.Security;
#if MAGICACLOTH2
Expand Down Expand Up @@ -81,6 +82,8 @@ private static Camera[] GetAllMirrorCameras() => Object.FindObjectsOfType<Mirror

public static void ImplementRestrictions()
{
Security.RegisterForceDeleteObject<EventSystem>();
Security.RegisterForceDeleteObject<StandaloneInputModule>();
Security.RegisterComponentRestriction<Camera>((component, _) =>
{
Camera camera = (Camera) component;
Expand Down
4 changes: 3 additions & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.1.0
preloadedAssets: []
preloadedAssets:
- {fileID: -5264253658483339981, guid: 95c4cfd8338326e45922c4ac0ed2ff73, type: 2}
- {fileID: 5711663381222140903, guid: a08e1849d99fdcd4ea4a7ae8dfb275d4, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down

0 comments on commit 07a4fc2

Please sign in to comment.