sm-plugins/eventqueue-fix
1
0
Fork 0
mirror of https://github.com/hermansimensen/eventqueue-fix.git synced 2025-12-07 10:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix unable to find entity bug

Browse Source
This commit is contained in:
hermansimensen 2021-03-18 04:22:50 +01:00
parent 2bfdbbffa8
commit 461f508057
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scripting/eventqueuefix.sp
View File

@ -349,7 +349,7 @@ public void ServiceEvent(event_t event)
{ {
if(!strcmp("kill", event.targetInput, false)) if(!strcmp("kill", event.targetInput, false))
{ {
for(int i = 0; i < 32; i++) for(int i = 0; i < 4; i++)
{ {
targetEntity = SDKCall(g_hFindEntityByName, 0, event.target, event.caller, event.activator, event.caller, 0); targetEntity = SDKCall(g_hFindEntityByName, 0, event.target, event.caller, event.activator, event.caller, 0);
if(targetEntity != -1) if(targetEntity != -1)
@ -357,17 +357,48 @@ public void ServiceEvent(event_t event)
AcceptEntityInput(targetEntity, event.targetInput, event.activator, event.caller, event.outputID); AcceptEntityInput(targetEntity, event.targetInput, event.activator, event.caller, event.outputID);
} else } else
{ {
break; //sometimes the call fails and we must use this slower method for now.
for(int y = 0; y < GetMaxEntities()*2; y++)
{
char name[32];
if(IsValidEntity(y))
GetEntPropString(y, Prop_Data, "m_iName", name, sizeof(name));
if(!strcmp(event.target, name, false))
{
AcceptEntityInput(y, event.targetInput, event.activator, event.caller, event.outputID);
break;
}
}
} }
} }
} }
else else
{ {
targetEntity = SDKCall(g_hFindEntityByName, 0, event.target, event.caller, event.activator, event.caller, 0); targetEntity = SDKCall(g_hFindEntityByName, -1, event.target, -1, -1, -1, 0);
if(targetEntity != -1) if(targetEntity != -1)
{ {
AcceptEntityInput(targetEntity, event.targetInput, event.activator, event.caller, event.outputID); AcceptEntityInput(targetEntity, event.targetInput, event.activator, event.caller, event.outputID);
} }
else
{
//if we still can't find the target use this slower method.
for(int i = 0; i < GetMaxEntities()*2; i++)
{
char name[32];
if(IsValidEntity(i))
GetEntPropString(i, Prop_Data, "m_iName", name, sizeof(name));
if(!strcmp(event.target, name, false))
{
AcceptEntityInput(i, event.targetInput, event.activator, event.caller, event.outputID);
break;
}
}
}
} }
} }
@ -401,7 +432,6 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
{ {
event_t event; event_t event;
g_aPlayerEvents[client].GetArray(i, event); g_aPlayerEvents[client].GetArray(i, event);
if(event.delay <= GetTickInterval() * timescale) if(event.delay <= GetTickInterval() * timescale)
{ {
ServiceEvent(event); ServiceEvent(event);