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.

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

fix(clr/shared): fix GetGamePool for server #2738

Merged
merged 2 commits into from
Oct 3, 2024

Conversation

AvarianKnight
Copy link
Contributor

@AvarianKnight AvarianKnight commented Aug 20, 2024

Goal of this PR

Fix bug for mono_rt2 server implementation introduced in #2488 (and temp fixed in 3768dc0)

This also changes the server variant for mono_rt2 from Object -> Prop fixing an oversight in #2731

This relies on on other changes so this will be marked as a draft for now.

How is this PR achieving the goal

Properly use server namespaces for native invokes

This PR applies to the following area(s)

Server

Successfully tested on

Game builds: ..

Platforms: Windows, Linux

Checklist

  • Code compiles and has been tested successfully.
  • Code explains itself well and/or is documented.
  • My commit message explains what the changes do and what they are for.
  • No extra compilation warnings are added by these changes.

Fixes issues

@github-actions github-actions bot added the triage Needs a preliminary assessment to determine the urgency and required action label Aug 20, 2024
@AvarianKnight AvarianKnight marked this pull request as ready for review August 22, 2024 16:49
@AvarianKnight
Copy link
Contributor Author

This relies on #2739 to work

@github-actions github-actions bot added invalid Requires changes before it's considered valid and can be (re)triaged and removed triage Needs a preliminary assessment to determine the urgency and required action labels Aug 22, 2024
@mcNuggets1
Copy link

At this point if not already happened, they should hire you.

Copy link
Contributor

@FabianTerhorst FabianTerhorst left a comment

Choose a reason for hiding this comment

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

Works fine, thanks 👍, Note: needs manual merge to fix conflict with #2737.

@FabianTerhorst FabianTerhorst added ready-to-merge This PR is enqueued for merging and removed invalid Requires changes before it's considered valid and can be (re)triaged ready-to-merge This PR is enqueued for merging labels Sep 27, 2024
@FabianTerhorst FabianTerhorst added the ready-to-merge This PR is enqueued for merging label Sep 27, 2024
@github-actions github-actions bot added the invalid Requires changes before it's considered valid and can be (re)triaged label Sep 27, 2024
@prikolium-cfx prikolium-cfx merged commit 3194c46 into citizenfx:master Oct 3, 2024
2 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid Requires changes before it's considered valid and can be (re)triaged ready-to-merge This PR is enqueued for merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants