araxiaonline/mod-mythic-plus
3
0
Fork 0
mirror of https://github.com/araxiaonline/mod-mythic-plus.git synced 2026-06-13 03:02:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes from Gemini review

Browse Source
This commit is contained in:
Ben Carter
2025-08-23 16:41:56 -04:00
parent 716ca94e73
commit 8fbb47b5b6
3 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/sql/db-world/base/03_mp_scale_factors.sql
View File

@@ -49,7 +49,7 @@ VALUES
(543, 1.6, 1.4, 1.4, 4, 3), -- Hellfire Ramparts (543, 1.6, 1.4, 1.4, 4, 3), -- Hellfire Ramparts
(545, 1.6, 1.4, 1.4, 4, 3), -- Coilfang Steamvaults (545, 1.6, 1.4, 1.4, 4, 3), -- Coilfang Steamvaults
(546, 1.6, 1.4, 1.4, 4, 3), -- Coilfang Reservoir: The Underbog (546, 1.6, 1.4, 1.4, 4, 3), -- Coilfang Reservoir: The Underbog
(547, 1.6, 1.4, 1.4, 4, 3), -- Coilfang Reservoir: The Underbog (547, 1.6, 1.4, 1.4, 4, 3), -- Coilfang Reservoir: The Slave Pens
(557, 1.6, 1.4, 1.4, 4, 3), -- Auchindoun: Mana-Tombs (557, 1.6, 1.4, 1.4, 4, 3), -- Auchindoun: Mana-Tombs
(558, 1.6, 1.4, 1.4, 4, 3), -- Auchindoun: Auchenai Crypts (558, 1.6, 1.4, 1.4, 4, 3), -- Auchindoun: Auchenai Crypts
(560, 1.6, 1.4, 1.4, 4, 3) -- Caverns of Time: Old Hillsbrad Foothills (560, 1.6, 1.4, 1.4, 4, 3) -- Caverns of Time: Old Hillsbrad Foothills

2
src/AdvancementMgr.h
View File

@@ -146,7 +146,7 @@ private:
void _SaveAdvancement(Player* player, MpAdvancementRank* advancementRank, MpPlayerRank* playerRank, uint32 diceCost, float roll, uint32 itemEntry1, uint32 itemEntry2 = 0, uint32 itemEntry3 = 0); void _SaveAdvancement(Player* player, MpAdvancementRank* advancementRank, MpPlayerRank* playerRank, uint32 diceCost, float roll, uint32 itemEntry1, uint32 itemEntry2 = 0, uint32 itemEntry3 = 0);
// This will save the advancement purchase to the history database // This will save the advancement purchase to the history database
void _DBSaveAdvancement(Player* player, MpAdvancementRank* advancementRank, MpPlayerRank* playerRank, uint32 diceCost, float roll); // void _DBSaveAdvancement(Player* player, MpAdvancementRank* advancementRank, MpPlayerRank* playerRank, uint32 diceCost, float roll);
}; };

46
src/Event/MpEventHandlers.cpp
View File

@@ -50,7 +50,7 @@ std::string EventCodeToString(MP_EVENT_CODE code)
} }
// Send an error event to the client // Send an error event to the client
bool SendEventError(Player* player, const std::string& method, MP_EVENT_CODE code, std::string message) bool SendEventError(Player* player, const std::string& /* method*/, MP_EVENT_CODE code, std::string message)
{ {
std::vector<std::string> clientError = { std::to_string(static_cast<int>(code)), message }; std::vector<std::string> clientError = { std::to_string(static_cast<int>(code)), message };
MpLogger::error("(Event Processor) Sending client error: {} {}", code, message); MpLogger::error("(Event Processor) Sending client error: {} {}", code, message);
@@ -87,12 +87,23 @@ class UpgradeAdvancements : public MpEventInterface
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT_SIZE, "Invalid number of arguments expected 2, found " + std::to_string(args.size())); return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT_SIZE, "Invalid number of arguments expected 2, found " + std::to_string(args.size()));
} }
uint32 advancementId = std::stoi(args[0]); uint32 advancementId, diceLevel;
try {
advancementId = std::stoi(args[0]);
} catch (const std::exception& e) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id format: " + args[0]);
}
if(advancementId >= MpAdvancements::MP_ADV_MAX) { if(advancementId >= MpAdvancements::MP_ADV_MAX) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id " + args[0] + " max is " + std::to_string(MpAdvancements::MP_ADV_MAX)); return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id " + args[0] + " max valid id is " + std::to_string(MpAdvancements::MP_ADV_MAX - 1));
} }
uint32 diceLevel = std::stoi(args[1]); try {
diceLevel = std::stoi(args[1]);
} catch (const std::exception& e) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid dice level format: " + args[1]);
}
if(diceLevel < 1 || diceLevel > 3) { if(diceLevel < 1 || diceLevel > 3) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid dice level " + args[1] + " valid values are 1,2,3"); return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid dice level " + args[1] + " valid values are 1,2,3");
} }
@@ -160,9 +171,15 @@ class GetPlayerRank : public MpEventInterface
return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT_SIZE, "Invalid number of arguments expected 1, found " + std::to_string(args.size())); return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT_SIZE, "Invalid number of arguments expected 1, found " + std::to_string(args.size()));
} }
uint32 advancementId = std::stoi(args[0]); uint32 advancementId;
try {
advancementId = std::stoi(args[0]);
} catch (const std::exception& e) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id format: " + args[0]);
}
if(advancementId >= MpAdvancements::MP_ADV_MAX) { if(advancementId >= MpAdvancements::MP_ADV_MAX) {
return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id " + args[0] + " max is " + std::to_string(MpAdvancements::MP_ADV_MAX)); return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id " + args[0] + " max valid id is " + std::to_string(MpAdvancements::MP_ADV_MAX - 1));
} }
MpPlayerRank* playerRank = sAdvancementMgr->GetPlayerAdvancementRank(player, static_cast<MpAdvancements>(advancementId)); MpPlayerRank* playerRank = sAdvancementMgr->GetPlayerAdvancementRank(player, static_cast<MpAdvancements>(advancementId));
@@ -206,12 +223,23 @@ class GetAdvancementRank : public MpEventInterface {
return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT_SIZE, "Invalid number of arguments expected 2, found " + std::to_string(args.size())); return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT_SIZE, "Invalid number of arguments expected 2, found " + std::to_string(args.size()));
} }
uint32 advancementId = std::stoi(args[0]); uint32 advancementId, rank;
try {
advancementId = std::stoi(args[0]);
} catch (const std::exception& e) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id format: " + args[0]);
}
if(advancementId >= MpAdvancements::MP_ADV_MAX) { if(advancementId >= MpAdvancements::MP_ADV_MAX) {
return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id " + args[0] + " max is " + std::to_string(MpAdvancements::MP_ADV_MAX)); return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid advancement id " + args[0] + " max valid id is " + std::to_string(MpAdvancements::MP_ADV_MAX - 1));
} }
uint32 rank = std::stoi(args[1]); try {
rank = std::stoi(args[1]);
} catch (const std::exception& e) {
return SendEventError(player, EventName(), MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid rank format: " + args[1]);
}
if(rank == 0) { if(rank == 0) {
return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid rank " + args[1] + " can not be empty"); return SendEventError(player, EventName(),MP_EVENT_CODE::INVALID_ARGUMENT, "Invalid rank " + args[1] + " can not be empty");
} }