[Repo] Shutdown Lua properly & Fix EntityList possibly causing a crash

Author: RaphaelIT7

source/lua.cpp

@@ -71,6 +71,15 @@ void Lua::FinalShutdown()
 	g_Lua = NULL;
 }
 
+void Lua::ManualShutdown()
+{
+	if (!g_Lua)
+		return;
+
+	Lua::Shutdown();
+	Lua::FinalShutdown();
+}
+
 static bool bManualShutdown = false;
 static Detouring::Hook detour_InitLuaClasses;
 static void hook_InitLuaClasses(GarrysMod::Lua::ILuaInterface* LUA) // ToDo: Add a hook to Lua::Startup or whatever it's name was and use that for the ServerInit.

source/lua.h

@@ -16,6 +16,7 @@ namespace Lua
 	extern bool PushHook(const char* pName);
 	extern void AddDetour();
 	extern void SetManualShutdown();
+	extern void ManualShutdown();
 	extern GarrysMod::Lua::ILuaInterface* GetRealm(unsigned char);
 	extern GarrysMod::Lua::ILuaShared* GetShared();
 

source/modules/entitylist.cpp

@@ -40,14 +40,18 @@ EntityList::~EntityList()
 void EntityList::Clear()
 {
 	pEntities.clear();
-	for (auto& [_, iReference] : pEntReferences)
-		g_Lua->ReferenceFree(iReference);
+	if (g_Lua)
+		for (auto& [_, iReference] : pEntReferences)
+			g_Lua->ReferenceFree(iReference);
 
 	pEntReferences.clear();
 }
 
 void EntityList::CreateReference(CBaseEntity* pEntity)
 {
+	if (!g_Lua)
+		Error("holylib: missing g_Lua!\n");
+
 	Util::Push_Entity(pEntity);
 	pEntReferences[pEntity] = g_Lua->ReferenceCreate();
 }
@@ -58,7 +62,8 @@ void EntityList::FreeEntity(CBaseEntity* pEntity)
 	if (it != pEntReferences.end())
 	{
 		if (IsValidReference(it->second))
-			g_Lua->ReferenceFree(it->second);
+			if (g_Lua)
+				g_Lua->ReferenceFree(it->second);
 
 		Vector_RemoveElement(pEntities, pEntity);
 		pEntReferences.erase(it);

source/plugin.cpp

@@ -176,6 +176,7 @@ void CServerPlugin::Unload(void)
 	}
 
 	HolyLua::Shutdown();
+	Lua::ManualShutdown(); // Called to make sure that everything is shut down properly in cases of plugin_unload. does nothing if g_Lua is already NULL.
 	g_pModuleManager.Shutdown();
 	Util::RemoveDetour();
 	Detour::Remove(0);