diff --git a/src/creatures/players/wheel/player_wheel.cpp b/src/creatures/players/wheel/player_wheel.cpp index 484419c3644..dfd685bd83f 100644 --- a/src/creatures/players/wheel/player_wheel.cpp +++ b/src/creatures/players/wheel/player_wheel.cpp @@ -2137,7 +2137,7 @@ bool PlayerWheel::checkDivineEmpowerment() { return updateClient; } - int32_t magicBonus = 0; + int32_t damageBonus = 0; bool isOwner = false; for (const auto &item : *items) { if (item->getID() == ITEM_DIVINE_EMPOWERMENT && item->isOwner(m_player.getGUID())) { diff --git a/src/io/io_wheel.hpp b/src/io/io_wheel.hpp index a7e9cc2d816..1bc56428b08 100644 --- a/src/io/io_wheel.hpp +++ b/src/io/io_wheel.hpp @@ -41,9 +41,9 @@ class IOWheelBonusData { struct Revelation { std::array(WheelStageEnum_t::TOTAL_COUNT)> stats = { - Stats { 16, 16 }, - Stats { 36, 36 }, - Stats { 80, 80 } + Stats { 4, 4 }, + Stats { 9, 9 }, + Stats { 20, 20 } }; }; diff --git a/src/io/iomapserialize.cpp b/src/io/iomapserialize.cpp index b0faec3b9d3..7d40bb54b73 100644 --- a/src/io/iomapserialize.cpp +++ b/src/io/iomapserialize.cpp @@ -150,7 +150,6 @@ bool IOMapSerialize::loadItem(PropStream &propStream, std::shared_ptr } std::shared_ptr container = item->getContainer(); if (container && !loadContainer(propStream, container)) { - return false; } diff --git a/src/server/network/webhook/webhook.cpp b/src/server/network/webhook/webhook.cpp index 2f90e9e0adf..a157a3e0c7b 100644 --- a/src/server/network/webhook/webhook.cpp +++ b/src/server/network/webhook/webhook.cpp @@ -43,12 +43,12 @@ void Webhook::run() { ); } -void Webhook::sendPayload(const std::string payload, std::string url) { +void Webhook::sendPayload(const std::string &payload, std::string url) { std::scoped_lock lock { taskLock }; webhooks.push_back(std::make_shared(payload, url)); } -void Webhook::sendMessage(const std::string title, const std::string message, int color, std::string url, bool embed) { +void Webhook::sendMessage(const std::string &title, const std::string &message, int color, std::string url, bool embed) { if (url.empty()) { url = g_configManager().getString(DISCORD_WEBHOOK_URL, __FUNCTION__); } @@ -60,7 +60,7 @@ void Webhook::sendMessage(const std::string title, const std::string message, in sendPayload(getPayload(title, message, color, embed), url); } -void Webhook::sendMessage(const std::string message, std::string url) { +void Webhook::sendMessage(const std::string &message, std::string url) { if (url.empty()) { url = g_configManager().getString(DISCORD_WEBHOOK_URL, __FUNCTION__); } @@ -112,7 +112,7 @@ size_t Webhook::writeCallback(void* contents, size_t size, size_t nmemb, void* u return real_size; } -std::string Webhook::getPayload(const std::string title, const std::string message, int color, bool embed) const { +std::string Webhook::getPayload(const std::string &title, const std::string &message, int color, bool embed) const { std::time_t now = getTimeNow(); std::string time_buf = formatDate(now); diff --git a/src/server/network/webhook/webhook.hpp b/src/server/network/webhook/webhook.hpp index 5f351815f3b..df414f24e1d 100644 --- a/src/server/network/webhook/webhook.hpp +++ b/src/server/network/webhook/webhook.hpp @@ -30,9 +30,9 @@ class Webhook { void run(); - void sendPayload(const std::string payload, std::string url); - void sendMessage(const std::string title, const std::string message, int color, std::string url = "", bool embed = true); - void sendMessage(const std::string message, std::string url = ""); + void sendPayload(const std::string &payload, std::string url); + void sendMessage(const std::string &title, const std::string &message, int color, std::string url = "", bool embed = true); + void sendMessage(const std::string &message, std::string url = ""); private: std::mutex taskLock; @@ -44,7 +44,7 @@ class Webhook { int sendRequest(const char* url, const char* payload, std::string* response_body) const; static size_t writeCallback(void* contents, size_t size, size_t nmemb, void* userp); - std::string getPayload(const std::string title, const std::string message, int color, bool embed = true) const; + std::string getPayload(const std::string &title, const std::string &message, int color, bool embed = true) const; }; constexpr auto g_webhook = Webhook::getInstance;