-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Last minute additions #2217
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.
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
base: master
Are you sure you want to change the base?
Last minute additions #2217
Conversation
dartasen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be separate PR's ?
NitroxModel/DataStructures/GameLogic/Entities/Metadata/KeypadMetadata.cs
Show resolved
Hide resolved
| public static IEnumerator WaitForWorldLoad() | ||
| public static IEnumerator WaitForWorldLoad(WaitForSeconds initialWait = null) | ||
| { | ||
| Entities entities = NitroxServiceLocator.LocateService<Entities>(); |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
| 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) |
There was a problem hiding this comment.
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
|
// KeypadMetadata.cs } // Terrain.cs } Make sure to replace the placeholder logic in IsInsideSubrootOrEscapePod with the actual implementation that checks the player's position relative to the subroot or escape pod. |
I might want to add a things or two before release which I'll put in here