gameevent: trying to fix a bug

RaphaelIT7 · Nov 25, 2024 · bab500a · bab500a
1 parent 9809ba8
commit bab500a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 14 deletions.
diff --git a/source/modules/filesystem.cpp b/source/modules/filesystem.cpp
@@ -327,11 +327,6 @@ static void ReadSearchCache()
 			g_pAbsoluteSearchCache[pathStr] = absolutePathStr;
 		}
 
-		/*for (auto& [key, val] : g_pAbsoluteSearchCache)
-		{
-			Msg("Key: %s\nValue: %s\n", key.data(), val.data());
-		}*/
-
 		//if (g_pFileSystemModule.InDebug())
 		Msg("holylib - filesystem: Loaded searchcache file (%i)\n", searchCache->usedPaths);
 		delete searchCache;

diff --git a/source/modules/gameevent.cpp b/source/modules/gameevent.cpp
@@ -579,7 +579,30 @@ void CGameeventLibModule::Init(CreateInterfaceFn* appfn, CreateInterfaceFn* game
 void CGameeventLibModule::LuaInit(bool bServerInit)
 {
 	if (bServerInit)
+	{
+		if (Util::PushTable("gameevent"))
+		{
+			g_Lua->GetField(-1, "Listen");
+			if (g_Lua->IsType(-1, GarrysMod::Lua::Type::Function))
+			{
+				g_Lua->PushString("vote_cast"); // Yes this is a valid gameevent.
+				g_Lua->CallFunctionProtected(1, 0, true);
+				CGameEventDescriptor* descriptor = pManager->GetEventDescriptor("vote_cast");
+				FOR_EACH_VEC(descriptor->listeners, i)
+				{
+					pLuaGameEventListener = (IGameEventListener2*)descriptor->listeners[i]->m_pCallback;
+					descriptor->listeners.Remove(i); // We also remove the listener again
+					break;
+				}
+				if (!pLuaGameEventListener)
+					Warning("holylib: Failed to find pLuaGameEventListener!\n");
+			} else {
+				g_Lua->Pop(1);
+			}
+		}
+		Util::PopTable();
 		return;
+	}
 
 	IGameEvent_TypeID = g_Lua->CreateMetaTable("IGameEvent");
 		Util::AddFunc(IGameEvent__tostring, "__tostring");
@@ -616,17 +639,22 @@ void CGameeventLibModule::LuaInit(bool bServerInit)
 		Util::AddFunc(gameevent_BlockCreation, "BlockCreation");
 
 		g_Lua->GetField(-1, "Listen");
-		g_Lua->PushString("vote_cast"); // Yes this is a valid gameevent.
-		g_Lua->CallFunctionProtected(1, 0, true);
-		CGameEventDescriptor* descriptor = pManager->GetEventDescriptor("vote_cast");
-		FOR_EACH_VEC(descriptor->listeners, i)
+		if (g_Lua->IsType(-1, GarrysMod::Lua::Type::Function))
 		{
-			pLuaGameEventListener = (IGameEventListener2*)descriptor->listeners[i]->m_pCallback;
-			descriptor->listeners.Remove(i); // We also remove the listener again
-			break;
+			g_Lua->PushString("vote_cast"); // Yes this is a valid gameevent.
+			g_Lua->CallFunctionProtected(1, 0, true);
+			CGameEventDescriptor* descriptor = pManager->GetEventDescriptor("vote_cast");
+			FOR_EACH_VEC(descriptor->listeners, i)
+			{
+				pLuaGameEventListener = (IGameEventListener2*)descriptor->listeners[i]->m_pCallback;
+				descriptor->listeners.Remove(i); // We also remove the listener again
+				break;
+			}
+			if (!pLuaGameEventListener)
+				Warning("holylib: Failed to find pLuaGameEventListener!\n");
+		} else {
+			g_Lua->Pop(1);
 		}
-		if (!pLuaGameEventListener)
-			Warning("holylib: Failed to find pLuaGameEventListener!\n");
 	}
 	Util::PopTable();
 }