summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/content_sao.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 770577c56..afe82bdd2 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1658,8 +1658,11 @@ std::string LuaEntitySAO::getStaticData()
void LuaEntitySAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
{
- if(!m_registered)
+ if(!m_registered){
+ // Delete unknown LuaEntities when punched
+ m_removed = true;
return;
+ }
lua_State *L = m_env->getLua();
scriptapi_luaentity_punch(L, m_id, puncher, time_from_last_punch);
}