fix: validations of "getPlayer" lua function

src/lua/functions/core/game/bank_functions.cpp

@@ -7,7 +7,7 @@ int BankFunctions::luaBankCredit(lua_State* L) {
 	// Bank.credit(playerOrGuild, amount)
 	auto bank = getBank(L, 1);
 	if (bank == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Bank is nullptr");
 		return 1;
 	}
 	uint64_t amount = getNumber<uint64_t>(L, 2);
@@ -19,7 +19,7 @@ int BankFunctions::luaBankDebit(lua_State* L) {
 	// Bank.debit(playerOrGuild, amount)
 	auto bank = getBank(L, 1);
 	if (bank == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Bank is nullptr");
 		return 1;
 	}
 	uint64_t amount = getNumber<uint64_t>(L, 2);
@@ -31,7 +31,7 @@ int BankFunctions::luaBankBalance(lua_State* L) {
 	// Bank.balance(playerOrGuild[, amount]])
 	auto bank = getBank(L, 1);
 	if (bank == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Bank is nullptr");
 		return 1;
 	}
 	if (lua_gettop(L) == 1) {
@@ -47,7 +47,7 @@ int BankFunctions::luaBankHasBalance(lua_State* L) {
 	// Bank.hasBalance(playerOrGuild, amount)
 	auto bank = getBank(L, 1);
 	if (bank == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Bank is nullptr");
 		return 1;
 	}
 	uint64_t amount = getNumber<uint64_t>(L, 2);
@@ -60,13 +60,13 @@ int BankFunctions::luaBankTransfer(lua_State* L) {
 	auto source = getBank(L, 1);
 	if (source == nullptr) {
 		g_logger().debug("BankFunctions::luaBankTransfer: source is null");
-		lua_pushnil(L);
+		reportErrorFunc("Bank is nullptr");
 		return 1;
 	}
 	std::shared_ptr<Bank> destination = getBank(L, 2);
 	if (destination == nullptr) {
 		g_logger().debug("BankFunctions::luaBankTransfer: destination is null");
-		lua_pushnil(L);
+		reportErrorFunc("Bank is nullptr");
 		return 1;
 	}
 	uint64_t amount = getNumber<uint64_t>(L, 3);
@@ -78,12 +78,12 @@ int BankFunctions::luaBankTransferToGuild(lua_State* L) {
 	// Bank.transfer(fromPlayerOrGuild, toGuild, amount)
 	auto source = getBank(L, 1);
 	if (source == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Source is nullptr");
 		return 1;
 	}
 	std::shared_ptr<Bank> destination = getBank(L, 2, true /* isGuild */);
 	if (destination == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Destination is nullptr");
 		return 1;
 	}
 	uint64_t amount = getNumber<uint64_t>(L, 3);
@@ -93,20 +93,21 @@ int BankFunctions::luaBankTransferToGuild(lua_State* L) {
 
 int BankFunctions::luaBankWithdraw(lua_State* L) {
 	// Bank.withdraw(player, amount[, source = player])
-	auto player = getPlayer(L, 1);
+	const auto &player = getPlayer(L, 1);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
 	uint64_t amount = getNumber<uint64_t>(L, 2);
 	if (lua_gettop(L) == 2) {
-		if (!player) {
-			return 1;
-		}
-
 		const auto bank = std::make_shared<Bank>(player);
 		pushBoolean(L, bank->withdraw(player, amount));
 		return 1;
 	}
 	auto source = getBank(L, 3);
 	if (source == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Source is nullptr");
 		return 1;
 	}
 	pushBoolean(L, source->withdraw(player, amount));
@@ -115,8 +116,9 @@ int BankFunctions::luaBankWithdraw(lua_State* L) {
 
 int BankFunctions::luaBankDeposit(lua_State* L) {
 	// Bank.deposit(player, amount[, destination = player])
-	auto player = getPlayer(L, 1);
+	const auto &player = getPlayer(L, 1);
 	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
 		return 1;
 	}
 	const auto bank = std::make_shared<Bank>(player);
@@ -134,7 +136,7 @@ int BankFunctions::luaBankDeposit(lua_State* L) {
 	}
 	auto destination = getBank(L, 3);
 	if (destination == nullptr) {
-		lua_pushnil(L);
+		reportErrorFunc("Destination is nullptr");
 		return 1;
 	}
 	pushBoolean(L, g_game().removeMoney(player, amount) && destination->credit(amount));

src/lua/functions/core/game/global_functions.cpp

@@ -741,16 +741,16 @@ int GlobalFunctions::luaDebugPrint(lua_State* L) {
 
 int GlobalFunctions::luaIsInWar(lua_State* L) {
 	// isInWar(cid, target)
-	std::shared_ptr<Player> player = getPlayer(L, 1);
+	const auto &player = getPlayer(L, 1);
 	if (!player) {
-		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		reportErrorFunc(fmt::format("{} - Player", getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)));
 		pushBoolean(L, false);
 		return 1;
 	}
 
-	std::shared_ptr<Player> targetPlayer = getPlayer(L, 2);
+	const auto &targetPlayer = getPlayer(L, 2);
 	if (!targetPlayer) {
-		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		reportErrorFunc(fmt::format("{} - TargetPlayer", getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)));
 		pushBoolean(L, false);
 		return 1;
 	}

src/lua/functions/core/game/modal_window_functions.cpp

@@ -204,9 +204,9 @@ int ModalWindowFunctions::luaModalWindowSetPriority(lua_State* L) {
 
 int ModalWindowFunctions::luaModalWindowSendToPlayer(lua_State* L) {
 	// modalWindow:sendToPlayer(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
 	if (!player) {
-		lua_pushnil(L);
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
 		return 1;
 	}
 

src/lua/functions/core/network/network_message_functions.cpp

@@ -289,12 +289,12 @@ int NetworkMessageFunctions::luaNetworkMessageSendToPlayer(lua_State* L) {
 	}
 
 	const auto &player = getPlayer(L, 2);
-	if (player) {
-		player->sendNetworkMessage(*message);
-		pushBoolean(L, true);
-	} else {
+	if (!player) {
 		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
-		lua_pushnil(L);
+		return 1;
 	}
+
+	player->sendNetworkMessage(*message);
+	pushBoolean(L, true);
 	return 1;
 }

src/lua/functions/creatures/npc/npc_functions.cpp

@@ -347,7 +347,7 @@ int NpcFunctions::luaNpcOpenShopWindow(lua_State* L) {
 		return 1;
 	}
 
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
 	if (!player) {
 		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
 		pushBoolean(L, false);
@@ -360,7 +360,7 @@ int NpcFunctions::luaNpcOpenShopWindow(lua_State* L) {
 
 int NpcFunctions::luaNpcCloseShopWindow(lua_State* L) {
 	// npc:closeShopWindow(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
 	if (!player) {
 		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
 		pushBoolean(L, false);
@@ -452,7 +452,13 @@ int NpcFunctions::luaNpcFollow(lua_State* L) {
 		return 1;
 	}
 
-	pushBoolean(L, npc->setFollowCreature(getPlayer(L, 2)));
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
+	pushBoolean(L, npc->setFollowCreature(player));
 	return 1;
 }
 
@@ -478,7 +484,7 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) {
 		return 1;
 	}
 
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
 	if (!player) {
 		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
 		pushBoolean(L, false);

src/lua/functions/creatures/player/party_functions.cpp

@@ -69,9 +69,14 @@ int PartyFunctions::luaPartyGetLeader(lua_State* L) {
 
 int PartyFunctions::luaPartySetLeader(lua_State* L) {
 	// party:setLeader(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
 	std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1);
-	if (party && player) {
+	if (party) {
 		pushBoolean(L, party->passPartyLeadership(player));
 	} else {
 		lua_pushnil(L);
@@ -139,7 +144,12 @@ int PartyFunctions::luaPartyGetInviteeCount(lua_State* L) {
 
 int PartyFunctions::luaPartyAddInvite(lua_State* L) {
 	// party:addInvite(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
 	std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1);
 	if (party && player) {
 		pushBoolean(L, party->invitePlayer(player));
@@ -151,7 +161,12 @@ int PartyFunctions::luaPartyAddInvite(lua_State* L) {
 
 int PartyFunctions::luaPartyRemoveInvite(lua_State* L) {
 	// party:removeInvite(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
 	std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1);
 	if (party && player) {
 		pushBoolean(L, party->removeInvite(player));
@@ -163,7 +178,12 @@ int PartyFunctions::luaPartyRemoveInvite(lua_State* L) {
 
 int PartyFunctions::luaPartyAddMember(lua_State* L) {
 	// party:addMember(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
 	std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1);
 	if (party && player) {
 		pushBoolean(L, party->joinParty(player));
@@ -175,7 +195,12 @@ int PartyFunctions::luaPartyAddMember(lua_State* L) {
 
 int PartyFunctions::luaPartyRemoveMember(lua_State* L) {
 	// party:removeMember(player)
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
+
 	std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1);
 	if (party && player) {
 		pushBoolean(L, party->leaveParty(player));

src/lua/functions/creatures/player/player_functions.cpp

@@ -983,16 +983,17 @@ int PlayerFunctions::luaPlayerGetMaxMana(lua_State* L) {
 
 int PlayerFunctions::luaPlayerSetMaxMana(lua_State* L) {
 	// player:setMaxMana(maxMana)
-	std::shared_ptr<Player> player = getPlayer(L, 1);
-	if (player) {
-		player->manaMax = getNumber<int32_t>(L, 2);
-		player->mana = std::min<int32_t>(player->mana, player->manaMax);
-		g_game().addPlayerMana(player);
-		player->sendStats();
-		pushBoolean(L, true);
-	} else {
-		lua_pushnil(L);
+	const auto &player = getPlayer(L, 1);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
 	}
+
+	player->manaMax = getNumber<int32_t>(L, 2);
+	player->mana = std::min<int32_t>(player->mana, player->manaMax);
+	g_game().addPlayerMana(player);
+	player->sendStats();
+	pushBoolean(L, true);
 	return 1;
 }
 

src/lua/functions/map/house_functions.cpp

@@ -368,7 +368,12 @@ int HouseFunctions::luaHouseCanEditAccessList(lua_State* L) {
 	}
 
 	uint32_t listId = getNumber<uint32_t>(L, 2);
-	std::shared_ptr<Player> player = getPlayer(L, 3);
+
+	const auto &player = getPlayer(L, 3);
+	if (!player) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
+		return 1;
+	}
 
 	pushBoolean(L, house->canEditAccessList(listId, player));
 	return 1;
@@ -415,7 +420,19 @@ int HouseFunctions::luaHouseKickPlayer(lua_State* L) {
 		return 1;
 	}
 
-	pushBoolean(L, house->kickPlayer(getPlayer(L, 2), getPlayer(L, 3)));
+	const auto &player = getPlayer(L, 2);
+	if (!player) {
+		reportErrorFunc("Player is nullptr");
+		return 1;
+	}
+
+	auto targetPlayer = getPlayer(L, 3);
+	if (!targetPlayer) {
+		reportErrorFunc("Target player is nullptr");
+		return 1;
+	}
+
+	pushBoolean(L, house->kickPlayer(player, targetPlayer));
 	return 1;
 }
 
@@ -427,9 +444,9 @@ int HouseFunctions::luaHouseIsInvited(lua_State* L) {
 		return 1;
 	}
 
-	std::shared_ptr<Player> player = getPlayer(L, 2);
+	const auto &player = getPlayer(L, 2);
 	if (!player) {
-		lua_pushnil(L);
+		reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND));
 		return 1;
 	}