Enable BaseEvent:Connect to recieve an AsyncTask or a function. Trigger now assumes AsyncTask if the listener is a table

Author: STBrian

LunaCoreRuntime/src/Core/Event.cpp

@@ -131,7 +131,20 @@ void Core::EventHandlerCallback()
 static int l_Event_BaseEvent_Connect(lua_State *L)
 {
     luaL_checktype(L, 1, LUA_TTABLE);
-    luaL_checktype(L, 2, LUA_TFUNCTION);
+    if (!lua_isfunction(L, 2)) {
+        bool valid = false;
+        if (lua_istable(L, 2)) { // Check for AsyncTask
+            if (luaL_getmetafield(L, -1, "__name") != LUA_TNIL) {
+                if (lua_isstring(L, -1)) {
+                    if (std::string(lua_tostring(L, -1)) == "AsyncTask")
+                        valid = true;
+                }
+                lua_pop(L, 1);
+            }
+        }
+        if (!valid)
+            return luaL_error(L, "bad argument #2 to 'Connect' (function or AsyncTask expected, got %s)", luaL_typename(L, 2));
+    }
 
     lua_getfield(L, 1, "listeners");
     if (!lua_istable(L, -1)) {
@@ -176,29 +189,20 @@ static int l_Event_BaseEvent_Trigger(lua_State *L)
     for (int i = len; i >= 1; --i) {
         lua_rawgeti(L, listenersIdx, i);
         if (!lua_isfunction(L, -1)) {
-            if (lua_istable(L, -1)) { // AsyncTask
-                if (luaL_getmetafield(L, -1, "__name") != LUA_TNIL) {
-                    if (!lua_isstring(L, -1))
-                        lua_pop(L, 1);
-                    else {
-                        if (std::string(lua_tostring(L, -1)) == "AsyncTask") {
-                            lua_pop(L, 1);
-                            lua_pushstring(L, "_taskF");
-                            lua_rawget(L, -2);
-                            
-                            lua_State *co = lua_newthread(L);
-                            lua_pushvalue(L, -2);
-                            lua_xmove(L, co, 1);
-
-                            lua_sethook(co, Core::_TimeoutAsyncHook, LUA_MASKCOUNT, 100);
-
-                            Core::Scheduler::getInstance().AddTask(L, -1);
-                            lua_pop(L, 2); // pop co and taskF
-                        }
-                    }
-                }
+            if (lua_istable(L, -1)) { // Assume AsyncTask
+                lua_pushstring(L, "_taskF");
+                lua_rawget(L, -2);
+                
+                lua_State *co = lua_newthread(L);
+                lua_pushvalue(L, -2);
+                lua_xmove(L, co, 1);
+
+                lua_sethook(co, Core::_TimeoutAsyncHook, LUA_MASKCOUNT, 100);
+
+                Core::Scheduler::getInstance().AddTask(L, -1);
+                lua_pop(L, 2); // pop co and taskF
             }
-            lua_pop(L, 1);
+            lua_pop(L, 1); // pop value
             continue;
         }