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

tweak(mono-rt2): swap back to using Prop instead of Object #2731

Merged
merged 1 commit into from
Aug 20, 2024

Conversation

AvarianKnight
Copy link
Contributor

@AvarianKnight AvarianKnight commented Aug 20, 2024

Goal of this PR

Using CitizenFX.Core.Object alongside the regular System.Object leads to annoying cases where you have to disambiguate between if you want to use CitizenFX.Core.Object or System.Object

This goes back to the default that rt1 uses which is to have Object named Prop so you don't have to do any disambiguation with CLR

How is this PR achieving the goal

Removes object class for rt2 and just uses the original rt1 Prop class

This PR applies to the following area(s)

FiveM, C#

Successfully tested on

This hasn't been tested.

Game builds: ..

Platforms: Windows

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.

- using Object alongside the regular C# Object leads to annoying cases where you have to disambiguate between if you want to use CitizenFX.Core.Object or System.Object

- this goes back to the default that rt1 uses which is to have objects named prop
@github-actions github-actions bot added the triage Needs a preliminary assessment to determine the urgency and required action label Aug 20, 2024
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.

Thanks for the fix. Breaking changes in mono rt2 are fine 👍

@FabianTerhorst FabianTerhorst added ready-to-merge This PR is enqueued for merging and removed triage Needs a preliminary assessment to determine the urgency and required action labels Aug 20, 2024
@github-actions github-actions bot added the triage Needs a preliminary assessment to determine the urgency and required action label Aug 20, 2024
@prikolium-cfx prikolium-cfx merged commit 7ee8cb4 into citizenfx:master Aug 20, 2024
12 checks passed
AvarianKnight added a commit to AvarianKnight/fivem that referenced this pull request Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR is enqueued for merging triage Needs a preliminary assessment to determine the urgency and required action
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants