CSSZombieEscape/sm-zombiereloaded-3
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Imported fix from dev: 687:5d695a55d80e - Fixed saved classes not validated by team id when restoring from cookies.

Browse Source
This commit is contained in:
Richard Helgeby 2010-04-05 00:57:41 +02:00
parent 07b4ed9373
commit 9ec9a121da
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/zr/playerclasses/playerclasses.inc
View File

@ -1022,9 +1022,12 @@ ClassClientSetDefaultIndexes(client = -1)
// class index when restored. // class index when restored.
// Check if class indexes are set and that the client pass the filter. // Check if class indexes are set and that the client pass the filter.
// Also check that the saved class' team id match with the loaded class.
// If not, fall back to default class indexes. Otherwise substract // If not, fall back to default class indexes. Otherwise substract
// index by one. // index by one.
if (zombieindex <= 0 || !ClassFilterMatch(zombieindex - 1, filter)) if (zombieindex <= 0 ||
!(ClassGetTeamID(zombieindex - 1) == ZR_CLASS_TEAM_ZOMBIES) ||
!ClassFilterMatch(zombieindex - 1, filter))
{ {
zombieindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ZOMBIES, filter); zombieindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ZOMBIES, filter);
} }
@ -1034,7 +1037,9 @@ ClassClientSetDefaultIndexes(client = -1)
haszombie = true; haszombie = true;
} }
if (humanindex <= 0 || !ClassFilterMatch(humanindex - 1, filter)) if (humanindex <= 0 ||
!(ClassGetTeamID(humanindex - 1) == ZR_CLASS_TEAM_HUMANS) ||
!ClassFilterMatch(humanindex - 1, filter))
{ {
humanindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_HUMANS, filter); humanindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_HUMANS, filter);
} }
@ -1044,7 +1049,9 @@ ClassClientSetDefaultIndexes(client = -1)
hashuman = true; hashuman = true;
} }
if (adminindex <= 0 || !ClassFilterMatch(adminindex - 1, filter)) if (adminindex <= 0 ||
!(ClassGetTeamID(adminindex - 1) == ZR_CLASS_TEAM_ADMINS) ||
!ClassFilterMatch(adminindex - 1, filter))
{ {
adminindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ADMINS, filter); adminindex = ClassGetDefaultSpawnClass(ZR_CLASS_TEAM_ADMINS, filter);
} }