UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SDKHook_[Use|Spawn|GetMaxHealth] callback result value handling (#1872)

Browse Source 
* Fix SDKHook_Use callback result handling

The returned result of the last callback in the list was used instead
of the highest value. This differs from the behavior of the other hooks.

* Fix SDKHook_Spawn callback result handling

The returned result of the last callback in the list was used instead
of the highest value. This differs from the behavior of the other hooks.

* Fix SDKHook_GetMaxHealth callback result handling

The returned result of the last callback in the list was used instead
of the highest value. This differs from the behavior of the other hooks.
The returned health is only changed if no other plugin wants to block the callback.
This commit is contained in:
peace-maker 2022-12-04 12:12:42 +01:00 committed by GitHub
parent 5d391fda07
commit aab8c6ac9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
extensions/sdkhooks/extension.cpp
View File

@ -1046,7 +1046,7 @@ int SDKHooks::Hook_GetMaxHealth()
int new_max = original_max;
cell_t res = Pl_Continue;
cell_t ret = Pl_Continue;
std::vector<IPluginFunction *> callbackList;
PopulateCallbackList(vtablehooklist[entry]->hooks, callbackList, entity);
@ -1055,10 +1055,20 @@ int SDKHooks::Hook_GetMaxHealth()
IPluginFunction *callback = callbackList[entry];
callback->PushCell(entity);
callback->PushCellByRef(&new_max);
cell_t res;
callback->Execute(&res);
if (res > ret)
{
ret = res;
}
}
if (res >= Pl_Changed)
if (ret >= Pl_Handled)
RETURN_META_VALUE(MRES_SUPERCEDE, original_max);
if (ret >= Pl_Changed)
RETURN_META_VALUE(MRES_SUPERCEDE, new_max);
break;
@ -1383,7 +1393,7 @@ void SDKHooks::Hook_Spawn()
}
int entity = gamehelpers->EntityToBCompatRef(pEntity);
cell_t res = Pl_Continue;
cell_t ret = Pl_Continue;
std::vector<IPluginFunction *> callbackList;
PopulateCallbackList(vtablehooklist[entry]->hooks, callbackList, entity);
@ -1391,10 +1401,17 @@ void SDKHooks::Hook_Spawn()
{
IPluginFunction *callback = callbackList[entry];
callback->PushCell(entity);
cell_t res;
callback->Execute(&res);
if (res > ret)
{
ret = res;
}
}
if (res >= Pl_Handled)
if (ret >= Pl_Handled)
RETURN_META(MRES_SUPERCEDE);
break;
@ -1605,7 +1622,14 @@ void SDKHooks::Hook_Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE
callback->PushCell(caller);
callback->PushCell(useType);
callback->PushFloat(value);
callback->Execute(&ret);
cell_t res;
callback->Execute(&res);
if (res > ret)
{
ret = res;
}
}
if (ret >= Pl_Handled)