fix: duplicate event and improve returns

Author: dudantas

data-otservbr-global/scripts/quests/soul_war/globalevent-ebb_and_flow_change_maps.lua

@@ -37,7 +37,7 @@ local function loadMapEmpty()
 	SoulWarQuest.ebbAndFlow.setLoadedEmptyMap(true)
 	SoulWarQuest.ebbAndFlow.setActive(false)
 
-	local updatePlayers = EventCallback("UpdatePlayersEmptyEbbFlowMap")
+	local updatePlayers = EventCallback("UpdatePlayersEmptyEbbFlowMap", true)
 	function updatePlayers.mapOnLoad(mapPath)
 		if mapPath ~= SoulWarQuest.ebbAndFlow.mapsPath.empty then
 			return
@@ -95,7 +95,7 @@ local function loadMapInundate()
 	SoulWarQuest.ebbAndFlow.setLoadedEmptyMap(false)
 	SoulWarQuest.ebbAndFlow.setActive(true)
 
-	local updatePlayers = EventCallback("UpdatePlayersInundateEbbFlowMap")
+	local updatePlayers = EventCallback("UpdatePlayersInundateEbbFlowMap", true)
 	function updatePlayers.mapOnLoad(mapPath)
 		if mapPath ~= SoulWarQuest.ebbAndFlow.mapsPath.inundate then
 			return

src/lua/callbacks/events_callbacks.hpp

@@ -76,11 +76,13 @@ class EventsCallbacks {
 	template <typename CallbackFunc, typename... Args>
 	void executeCallback(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) {
 		auto it = m_callbacks.find(eventType);
-		if (it != m_callbacks.end()) {
-			for (const auto &entry : it->second) {
-				if (entry.callback && entry.callback->isLoadedCallback()) {
-					std::invoke(callbackFunc, *entry.callback, args...);
-				}
+		if (it == m_callbacks.end()) {
+			return;
+		}
+
+		for (const auto &entry : it->second) {
+			if (entry.callback && entry.callback->isLoadedCallback()) {
+				std::invoke(callbackFunc, *entry.callback, args...);
 			}
 		}
 	}
@@ -95,13 +97,15 @@ class EventsCallbacks {
 	template <typename CallbackFunc, typename... Args>
 	ReturnValue checkCallbackWithReturnValue(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) {
 		auto it = m_callbacks.find(eventType);
-		if (it != m_callbacks.end()) {
-			for (const auto &entry : it->second) {
-				if (entry.callback && entry.callback->isLoadedCallback()) {
-					ReturnValue callbackResult = std::invoke(callbackFunc, *entry.callback, args...);
-					if (callbackResult != RETURNVALUE_NOERROR) {
-						return callbackResult;
-					}
+		if (it == m_callbacks.end()) {
+			return RETURNVALUE_NOERROR;
+		}
+
+		for (const auto &entry : it->second) {
+			if (entry.callback && entry.callback->isLoadedCallback()) {
+				ReturnValue callbackResult = std::invoke(callbackFunc, *entry.callback, args...);
+				if (callbackResult != RETURNVALUE_NOERROR) {
+					return callbackResult;
 				}
 			}
 		}
@@ -119,12 +123,14 @@ class EventsCallbacks {
 	bool checkCallback(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) {
 		bool allCallbacksSucceeded = true;
 		auto it = m_callbacks.find(eventType);
-		if (it != m_callbacks.end()) {
-			for (const auto &entry : it->second) {
-				if (entry.callback && entry.callback->isLoadedCallback()) {
-					bool callbackResult = std::invoke(callbackFunc, *entry.callback, args...);
-					allCallbacksSucceeded &= callbackResult;
-				}
+		if (it == m_callbacks.end()) {
+			return allCallbacksSucceeded;
+		}
+
+		for (const auto &entry : it->second) {
+			if (entry.callback && entry.callback->isLoadedCallback()) {
+				bool callbackResult = std::invoke(callbackFunc, *entry.callback, args...);
+				allCallbacksSucceeded &= callbackResult;
 			}
 		}
 		return allCallbacksSucceeded;