ViSH: explicitly register script handlers for FishThread

Author: blattersturm

code/components/scripthookv/component.json

@@ -6,7 +6,8 @@
 		"rage:scripting:five",
 		"rage:input:five",
 		"rage:graphics:five",
-		"citizen:resources:core"
+		"citizen:resources:core",
+		"gta:mission-cleanup:five"
 	],
 	"provides": []
 }

code/components/scripthookv/src/VishCompat.cpp

@@ -7,6 +7,8 @@
 
 #include "StdInc.h"
 #include <scrEngine.h>
+#include <ScriptHandlerMgr.h>
+
 #include "ICoreGameInit.h"
 #include <InputHook.h>
 #include <IteratorView.h>
@@ -112,13 +114,24 @@ class FishThread : public GtaThread
 
 	bool m_initedNet;
 
+	bool m_hasScriptHandler;
+
 public:
 	virtual void DoRun() override
 	{
+		if (!m_hasScriptHandler)
+		{
+			CGameScriptHandlerMgr::GetInstance()->AttachScript(this);
+
+			m_hasScriptHandler = true;
+		}
+
 		if (!m_initedNet)
 		{
 			// make this a network script
 			NativeInvoke::Invoke<0x1CA59E306ECB80A5, int>(32, false, -1);
+
+			m_initedNet = true;
 		}
 
 		std::vector<std::shared_ptr<FishScript>> thisIterScripts(m_scripts);
@@ -129,6 +142,8 @@ class FishThread : public GtaThread
 		}
 	}
 
+	virtual void Kill() override;
+
 	virtual rage::eThreadState Reset(uint32_t scriptHash, void* pArgs, uint32_t argCount) override;
 
 	void AddScript(void(*fn)());
@@ -161,6 +176,11 @@ rage::eThreadState FishThread::Reset(uint32_t scriptHash, void* pArgs, uint32_t
 	return GtaThread::Reset(scriptHash, pArgs, argCount);
 }
 
+void FishThread::Kill()
+{
+	m_hasScriptHandler = false;
+}
+
 void FishThread::AddScript(void(*fn)())
 {
 	m_scripts.push_back(std::make_shared<FishScript>(fn));