From 98b4410dc759afa2c8329d3be48a13f17808cdde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Mon, 26 Oct 2026 16:57:10 +0200 Subject: [PATCH] Fix client world losing its Lua entity on map change --- Game.Client/C_BaseEntity.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Game.Client/C_BaseEntity.cs b/Game.Client/C_BaseEntity.cs index 76d1f8fd..aaa4565c 100644 --- a/Game.Client/C_BaseEntity.cs +++ b/Game.Client/C_BaseEntity.cs @@ -1386,6 +1386,12 @@ public virtual void Release() { UpdateOnRemove(); Term(); + + LuaEntityObject?.UnReference(); + LuaEntityObject = null; + LuaTableObject?.UnReference(); + LuaTableObject = null; + LuaCalcAbsolutePosition.UnReference(); } public int DataObjectTypes; @@ -1421,12 +1427,6 @@ public virtual void Term() { DestroyModelInstance(); RemoveFromLeafSystem(); RemoveFromAimEntsList(); - - LuaEntityObject?.UnReference(); - LuaEntityObject = null; - LuaTableObject?.UnReference(); - LuaTableObject = null; - LuaCalcAbsolutePosition.UnReference(); } public bool OnPredictedEntityRemove(bool isbeingremoved, C_BaseEntity predicted) {