Fix force event messages

otland · Oct 9, 2023 · 857c07c · 857c07c
1 parent 8c6b0b9
commit 857c07c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/data/talkactions/scripts/force_event.lua b/data/talkactions/scripts/force_event.lua
@@ -10,10 +10,11 @@ function onSay(player, words, param)
 	logCommand(player, words, param)
 
 	local returnValue = Game.startEvent(param)
-	if returnValue then
-		player:sendTextMessage(MESSAGE_INFO_DESCR, "Event started.")
-	else
+	if returnValue == nil then
 		player:sendTextMessage(MESSAGE_INFO_DESCR, "No such event exists.")
+		return false
 	end
+
+	player:sendTextMessage(MESSAGE_INFO_DESCR, "Event started.")
 	return returnValue
 end
diff --git a/src/luascript.cpp b/src/luascript.cpp
@@ -4989,7 +4989,7 @@ int LuaScriptInterface::luaGameStartEvent(lua_State* L)
 	if (auto it = eventMap.find(eventName); it != eventMap.end()) {
 		pushBoolean(L, it->second.executeEvent());
 	} else {
-		pushBoolean(L, false);
+		lua_pushnil(L);
 	}
 	return 1;
 }