diff --git a/code/client/clrcore-v2/Client/FiveM/Object.cs b/code/client/clrcore-v2/Client/FiveM/Object.cs deleted file mode 100644 index 2aedb431c6..0000000000 --- a/code/client/clrcore-v2/Client/FiveM/Object.cs +++ /dev/null @@ -1,25 +0,0 @@ -using CitizenFX.Core; -using API = CitizenFX.FiveM.Native.Natives; - -namespace CitizenFX.FiveM -{ - public sealed class Object : Entity, Shared.IObject - { - public Object(int handle) : base(handle) - { - } - - /// - /// Determines whether this game object exists. - /// - /// true if this game object exists; otherwise, false - public new bool Exists() => base.Exists() && API.GetEntityType(Handle) == 3; - - /// - /// Determines whether the game object exists. - /// - /// The game object to check. - /// true if the game object exists; otherwise, false - public static bool Exists(Object prop) => !ReferenceEquals(prop, null) && prop.Exists(); - } -} diff --git a/code/client/clrcore/External/Entity.cs b/code/client/clrcore/External/Entity.cs index b7029bc1f2..bb830f57b0 100644 --- a/code/client/clrcore/External/Entity.cs +++ b/code/client/clrcore/External/Entity.cs @@ -8,7 +8,6 @@ using CitizenFX.FiveM.Native; using API = CitizenFX.FiveM.Native.Natives; using Function = CitizenFX.FiveM.Native.Natives; -using Prop = CitizenFX.FiveM.Object; namespace CitizenFX.FiveM #else diff --git a/code/client/clrcore/External/Prop.cs b/code/client/clrcore/External/Prop.cs index 56f2ddec9c..ad1c6dbf2e 100644 --- a/code/client/clrcore/External/Prop.cs +++ b/code/client/clrcore/External/Prop.cs @@ -1,9 +1,16 @@ -#if !MONO_V2 +#if MONO_V2 +using API = CitizenFX.FiveM.Native.Natives; +namespace CitizenFX.FiveM +#else using CitizenFX.Core.Native; - namespace CitizenFX.Core +#endif { public sealed class Prop : Entity +#if MONO_V2 + , Shared.IObject +#endif + { public Prop(int handle) : base(handle) { @@ -28,4 +35,3 @@ public static bool Exists(Prop prop) } } } -#endif diff --git a/code/client/clrcore/External/WeaponCollection.cs b/code/client/clrcore/External/WeaponCollection.cs index 7a58bf579c..3cf11c95f5 100644 --- a/code/client/clrcore/External/WeaponCollection.cs +++ b/code/client/clrcore/External/WeaponCollection.cs @@ -2,7 +2,6 @@ #if MONO_V2 using API = CitizenFX.FiveM.Native.Natives; -using Prop = CitizenFX.FiveM.Object; namespace CitizenFX.FiveM #else diff --git a/code/client/clrcore/External/World.cs b/code/client/clrcore/External/World.cs index 3973f18f90..8c36f145f8 100644 --- a/code/client/clrcore/External/World.cs +++ b/code/client/clrcore/External/World.cs @@ -6,10 +6,9 @@ #if MONO_V2 using CitizenFX.Core; using API = CitizenFX.FiveM.Native.Natives; -using Prop = CitizenFX.FiveM.Object; using TaskPed = CitizenFX.Core.Coroutine; using TaskPickup = CitizenFX.Core.Coroutine; -using TaskProp = CitizenFX.Core.Coroutine; +using TaskProp = CitizenFX.Core.Coroutine; using TaskVehicle = CitizenFX.Core.Coroutine; using compat_i32_u32 = System.UInt32; using compat_i32_i64 = System.Int64;