fix: prevent bugs in transfer coins (opentibiabr#714)

Added: • New method to lua from source; • Delay in parseTransferCoins.
LeoTKBR · Feb 12, 2023 · 6b69b23 · 6b69b23
1 parent ecc0642
commit 6b69b23
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/data/modules/scripts/gamestore/init.lua b/data/modules/scripts/gamestore/init.lua
@@ -256,6 +256,11 @@ function parseTransferCoins(playerId, msg)
 		return false
 	end
 
+	if player:isUIExhausted(2000) then
+		return addPlayerEvent(sendStoreError, 250, playerId, GameStore.StoreErrors.STORE_ERROR_TRANSFER, "You are exhausted.")
+	end
+
+	player:updateUIExhausted()
 	local reciver = msg:getString()
 	local amount = msg:getU32()
 

diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp
@@ -3207,3 +3207,31 @@ int PlayerFunctions::luaPlayerGetFaction(lua_State* L) {
 	lua_pushnumber(L, player->getFaction());
 	return 1;
 }
+
+int PlayerFunctions::luaPlayerIsUIExhausted(lua_State *L) {
+	// player:isUIExhausted()
+	Player* player = getUserdata<Player>(L, 1);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		pushBoolean(L, false);
+		return 0;
+	}
+
+	uint16_t time = getNumber<uint16_t>(L, 2);
+	pushBoolean(L, player->isUIExhausted(time));
+	return 1;
+}
+
+int PlayerFunctions::luaPlayerUpdateUIExhausted(lua_State *L) {
+	// player:updateUIExhausted(exhaustionTime = 250)
+	Player* player = getUserdata<Player>(L, 1);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		pushBoolean(L, false);
+		return 0;
+	}
+
+	player->updateUIExhausted();
+	pushBoolean(L, true);
+	return 1;
+}
diff --git a/src/lua/functions/creatures/player/player_functions.hpp b/src/lua/functions/creatures/player/player_functions.hpp
@@ -282,6 +282,8 @@ class PlayerFunctions final : LuaScriptInterface {
 
 			registerMethod(L, "Player", "getForgeSlivers", PlayerFunctions::luaPlayerGetForgeSlivers);
 			registerMethod(L, "Player", "getForgeCores", PlayerFunctions::luaPlayerGetForgeCores);
+			registerMethod(L, "Player", "isUIExhausted", PlayerFunctions::luaPlayerIsUIExhausted);
+			registerMethod(L, "Player", "updateUIExhausted", PlayerFunctions::luaPlayerUpdateUIExhausted);
 
 			registerMethod(L, "Player", "setFaction", PlayerFunctions::luaPlayerSetFaction);
 			registerMethod(L, "Player", "getFaction", PlayerFunctions::luaPlayerGetFaction);
@@ -560,6 +562,8 @@ class PlayerFunctions final : LuaScriptInterface {
 
 		static int luaPlayerGetForgeSlivers(lua_State* L);
 		static int luaPlayerGetForgeCores(lua_State* L);
+  	static int luaPlayerIsUIExhausted(lua_State* L);
+    static int luaPlayerUpdateUIExhausted(lua_State* L);
 
 		static int luaPlayerSetFaction(lua_State* L);
 		static int luaPlayerGetFaction(lua_State* L);