Fix invalid ped skin IDs accepted by map/XML ped loading

Lpsd · Lpsd · commit d4e6815fc05e · 2026-04-29T20:51:19.000+01:00
diff --git a/Server/mods/deathmatch/logic/CPedManager.cpp b/Server/mods/deathmatch/logic/CPedManager.cpp
@@ -12,6 +12,7 @@
 #include "StdInc.h"
 #include "CPedManager.h"
 #include "CPed.h"
+#include "CPlayerManager.h"
 #include "Utils.h"
 
 CPedManager::CPedManager()
@@ -74,5 +75,7 @@ bool CPedManager::Exists(CPed* pPed)
 
 bool CPedManager::IsValidModel(unsigned short usModel)
 {
-    return true;
+    // Peds created from maps/XML also end up here, so keep this aligned with the
+    // script-facing validator and reject unused GTA skin IDs before they can be synced.
+    return CPlayerManager::IsValidPlayerModel(usModel);
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include "StdInc.h"`
`13`	`13`	`#include "CPedManager.h"`
`14`	`14`	`#include "CPed.h"`
	`15`	`+#include "CPlayerManager.h"`
`15`	`16`	`#include "Utils.h"`
`16`	`17`
`17`	`18`	`CPedManager::CPedManager()`
`@@ -74,5 +75,7 @@ bool CPedManager::Exists(CPed* pPed)`
`74`	`75`
`75`	`76`	`bool CPedManager::IsValidModel(unsigned short usModel)`
`76`	`77`	`{`
`77`		`- return true;`
	`78`	`+ // Peds created from maps/XML also end up here, so keep this aligned with the`
	`79`	`+ // script-facing validator and reject unused GTA skin IDs before they can be synced.`
	`80`	`+ return CPlayerManager::IsValidPlayerModel(usModel);`
`78`	`81`	`}`