Merge Out of band infinite recursion fix (mr-273)

- 018ca01 fix(server): out of band infinite recursion
citizenfx · Apr 17, 2024 · 62d5dc4 · 62d5dc4
2 parents 400dec2 + 018ca01
commit 62d5dc4
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/code/components/citizen-server-impl/include/decorators/WithOutOfBand.h b/code/components/citizen-server-impl/include/decorators/WithOutOfBand.h
@@ -6,12 +6,6 @@ namespace fx
 {
 	namespace ServerDecorators
 	{
-		template <typename... TOOB>
-		const fwRefContainer<fx::GameServer>& WithOutOfBand(const fwRefContainer<fx::GameServer>& server)
-		{
-			return WithOutOfBand<TOOB...>(server);
-		}
-
 		template <typename ServerImpl, typename... TOOB>
 		const fwRefContainer<ServerImpl>& WithOutOfBandImpl(const fwRefContainer<ServerImpl>& server)
 		{
@@ -101,5 +95,11 @@ namespace fx
 
 			return server;
 		}
+
+		template <typename... TOOB>
+		const fwRefContainer<fx::GameServer>& WithOutOfBand(const fwRefContainer<fx::GameServer>& server)
+		{
+			return WithOutOfBandImpl<fx::GameServer, TOOB...>(server);
+		}
 	}
 }