Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Last minute additions #2217

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Last minute additions #2217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79a6695
Fix keypad sync
tornac1234 Jan 1, 2025
146f6a1
Fix falling through before the Aurora's entities have spawned
tornac1234 Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions NitroxClient/GameLogic/Terrain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
using System.Collections.Generic;
using NitroxClient.Communication.Abstract;
using NitroxClient.Map;
using NitroxClient.Unity.Helper;
using NitroxModel.Core;
using NitroxModel.DataStructures.GameLogic;
using NitroxModel.Packets;
using NitroxModel_Subnautica.DataStructures;
using UnityEngine;
using UWE;
using WorldStreaming;

namespace NitroxClient.GameLogic;
Expand Down Expand Up @@ -77,11 +80,23 @@ public void UpdateVisibility()

}

public static void WaitForEntities()
{
// In case the player is spawned in the air, we need to hold them up while all the entities load around them
if (Player.main && !Player.main.IsUnderwater() && !Player.main.groundMotor.grounded)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to fix: this should not trigger when inside a subroot/escape pod

{
Player.main.cinematicModeActive = true;
CoroutineHost.StartCoroutine(WaitForWorldLoad(Yielders.WaitFor2Seconds));
}
}

/// <summary>
/// Forces world streamer's to load the terrain around the MainCamera and waits until it's done to unfreeze the player.
/// </summary>
public static IEnumerator WaitForWorldLoad()
public static IEnumerator WaitForWorldLoad(WaitForSeconds initialWait = null)
{
Entities entities = NitroxServiceLocator.LocateService<Entities>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be using dependency injection, this will generate a warning from our analyzers

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It won't work in this static context

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Terrain is already being required inside Mutiplayer mb, so static can be removed


// In WorldStreamer.CreateStreamers() three coroutines are created to constantly call UpdateCenter() on the streamers
// We force these updates so that the world streamer gets busy instantly
WorldStreamer streamerV2 = LargeWorldStreamer.main.streamerV2;
Expand All @@ -90,7 +105,9 @@ public static IEnumerator WaitForWorldLoad()
streamerV2.lowDetailOctreesStreamer.UpdateCenter(streamerV2.streamingCenter);
streamerV2.clipmapStreamer.UpdateCenter(streamerV2.streamingCenter);

yield return new WaitUntil(() => LargeWorldStreamer.main.IsWorldSettled());
yield return initialWait;

yield return new WaitUntil(() => LargeWorldStreamer.main.IsWorldSettled() && entities.EntitiesToSpawn.Count == 0);
Player.main.cinematicModeActive = false;
}
}
2 changes: 2 additions & 0 deletions NitroxClient/MonoBehaviours/Multiplayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ private static void SetLoadingComplete()
LoadingScreenVersionText.DisableWarningText();
DiscordClient.InitializeRPInGame(Main.multiplayerSession.AuthenticationContext.Username, remotePlayerManager.GetTotalPlayerCount(), Main.multiplayerSession.SessionPolicy.MaxConnections);
CoroutineHost.StartCoroutine(NitroxServiceLocator.LocateService<PlayerChatManager>().LoadChatKeyHint());

GameLogic.Terrain.WaitForEntities();
}

private IEnumerator InitializeLocalPlayerState()
Expand Down