Skip to content

Commit 9ee294d

Browse files
Sergeanurqaisjp
authored andcommitted
Fix false elements in getElementsWithinRange (#300)
1 parent 7a9a246 commit 9ee294d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ int CLuaElementDefs::GetElementsWithinRange(lua_State* luaVM)
952952

953953
for (CClientEntity* entity : result)
954954
{
955-
if (elementType.empty() || elementType == entity->GetTypeName())
955+
if ((elementType.empty() || elementType == entity->GetTypeName()) && !entity->IsBeingDeleted())
956956
{
957957
lua_pushnumber(luaVM, ++index);
958958
lua_pushelement(luaVM, entity);

Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ int CLuaElementDefs::getElementsWithinRange(lua_State* luaVM)
10101010

10111011
for (CElement* entity : result)
10121012
{
1013-
if (elementType.empty() || elementType == entity->GetTypeName())
1013+
if ((elementType.empty() || elementType == entity->GetTypeName()) && !entity->IsBeingDeleted())
10141014
{
10151015
lua_pushnumber(luaVM, ++index);
10161016
lua_pushelement(luaVM, entity);

0 commit comments

Comments
 (0)