fix conflicts

opentibiabr · Nov 12, 2024 · b1d1e3e · b1d1e3e
1 parent 0801340
commit b1d1e3e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp
@@ -249,6 +249,7 @@ void PlayerFunctions::init(lua_State* L) {
 	Lua::registerMethod(L, "Player", "addTransferableCoins", PlayerFunctions::luaPlayerAddTransferableCoins);
 	Lua::registerMethod(L, "Player", "removeTransferableCoins", PlayerFunctions::luaPlayerRemoveTransferableCoins);
 
+	Lua::registerMethod(L, "Player", "sendBlessStatus", PlayerFunctions::luaPlayerSendBlessStatus);
 	Lua::registerMethod(L, "Player", "hasBlessing", PlayerFunctions::luaPlayerHasBlessing);
 	Lua::registerMethod(L, "Player", "addBlessing", PlayerFunctions::luaPlayerAddBlessing);
 	Lua::registerMethod(L, "Player", "removeBlessing", PlayerFunctions::luaPlayerRemoveBlessing);
@@ -3077,15 +3078,15 @@ int PlayerFunctions::luaPlayerRemoveTransferableCoins(lua_State* L) {
 
 int PlayerFunctions::luaPlayerSendBlessStatus(lua_State* L) {
 	// player:sendBlessStatus()
-	const auto &player = getUserdataShared<Player>(L, 1);
+	const auto &player = Lua::getUserdataShared<Player>(L, 1);
 	if (!player) {
-		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
-		pushBoolean(L, false);
+		Lua::reportErrorFunc(Lua::getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		Lua::pushBoolean(L, false);
 		return 0;
 	}
 
 	player->sendBlessStatus();
-	pushBoolean(L, true);
+	Lua::pushBoolean(L, true);
 	return 1;
 }