Merge Fix GetGamePool for server (pr-2738)

43af4e6 - fix(clr/shared): fix GetGamePool for server
citizenfx · Oct 3, 2024 · 3194c46 · 3194c46
2 parents 68c0c36 + 43af4e6
commit 3194c46
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/code/client/clrcore-v2/Game/Shared/Game.cs b/code/client/clrcore-v2/Game/Shared/Game.cs
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 
-#if GTA_FIVE || IS_RDR3
 
 #if MONO_V2
 #if IS_RDR3
 using CitizenFX.RedM.Native;
 namespace CitizenFX.RedM
+#elif IS_FXSERVER
+using CitizenFX.Server.Native;
+namespace CitizenFX.Server
 #else // IS_GTA
 using CitizenFX.FiveM.Native;
 namespace CitizenFX.FiveM
@@ -54,7 +56,9 @@ public static uint GenerateHashASCII(string input)
 		{
 			{ typeof(Ped), "CPed" },
 			{ typeof(Prop), "CObject" },
+#if !IS_FXSERVER
 			{ typeof(Pickup), "CPickup" },
+#endif
 			{ typeof(Vehicle), "CVehicle" }
 		};
 
@@ -91,6 +95,3 @@ public static IEnumerable<T> GetGamePool<T>()
 		}
 	}
 }
-
-#endif
-// END GTA_FIVE || IS_RDR3
diff --git a/code/client/clrcore/Server/Entity.cs b/code/client/clrcore/Server/Entity.cs
@@ -3,7 +3,6 @@
 #if MONO_V2
 using CitizenFX.Core;
 using API = CitizenFX.Server.Native.Natives;
-using Prop = CitizenFX.Server.Object;
 using compat_int_uint = System.UInt32;
 using compat_int_entity_type = CitizenFX.Shared.EntityType;
 #else

diff --git a/code/client/clrcore/Server/Prop.cs b/code/client/clrcore/Server/Prop.cs
@@ -1,20 +1,16 @@
 #if MONO_V2
 namespace CitizenFX.Server
-{
-	public sealed class Object : Entity, Shared.IObject
-	{
-		public Object(int handle) : base(handle)
-		{
-		}
-	}
 #else
 namespace CitizenFX.Core
+#endif
 {
 	public sealed class Prop : Entity
-	{
+#if MONO_V2
+	, Shared.IObject
+#endif
+{
 		public Prop(int handle) : base(handle)
 		{
 		}
 	}
-#endif
 }