markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: prevent bots from executing all forced client commands

Browse source
This commit is contained in:
jeefo 2024-01-20 12:09:27 +03:00
commit a2bb32f80b
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/linkage.cpp
View file

@ -49,12 +49,18 @@ namespace Hooks {
// sometimes actually by their side, that's why we strongly recommend to check it here too. In // sometimes actually by their side, that's why we strongly recommend to check it here too. In
// case it's a bot asking for a client command, we handle it like we do for bot commands // case it's a bot asking for a client command, we handle it like we do for bot commands
if (game.isNullEntity (ent) || (!game.isNullEntity (ent) && (ent->v.flags & FL_DORMANT))) { if (!game.isNullEntity (ent)) {
if (bots[ent] || util.isFakeClient (ent) || (ent->v.flags & FL_DORMANT)) {
if (game.is (GameFlags::Metamod)) { if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_SUPERCEDE); RETURN_META (MRES_SUPERCEDE); // prevent bots to be forced to issue client commands
} }
return; return;
} }
}
if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_IGNORED);
}
va_list ap; va_list ap;
auto buffer = strings.chars (); auto buffer = strings.chars ();
@ -63,22 +69,6 @@ namespace Hooks {
vsnprintf (buffer, StringBuffer::StaticBufferSize, format, ap); vsnprintf (buffer, StringBuffer::StaticBufferSize, format, ap);
va_end (ap); va_end (ap);
if (util.isFakeClient (ent)) {
auto bot = bots[ent];
if (bot) {
game.botCommand (bot->pev->pContainingEntity, buffer);
}
if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_SUPERCEDE); // prevent bots to be forced to issue client commands
}
return;
}
if (game.is (GameFlags::Metamod)) {
RETURN_META (MRES_IGNORED);
}
engfuncs.pfnClientCommand (ent, buffer); engfuncs.pfnClientCommand (ent, buffer);
} }
} }