diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-08-20 17:35:58 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-04 00:27:11 +0100 |
| commit | 317bb198b1152aafe8a48137e3748423eca02448 (patch) | |
| tree | 1cc6e1ef677880a6b2fac7c57f91635380bfc89d /src/server/game/Warden/WardenWin.cpp | |
| parent | 015cee5f272217010f7e59b96ddde36debb07ea1 (diff) | |
Core/Warden: Some Warden refactors lifted from #25286.
(cherry picked from commit 5b4288f05f7e2360bcdc80872787ee2e7a7a2f56)
Diffstat (limited to 'src/server/game/Warden/WardenWin.cpp')
| -rw-r--r-- | src/server/game/Warden/WardenWin.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index 9d83f9bbb97..d23e24a63e0 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -223,7 +223,7 @@ void WardenWin::RequestChecks() uint16 const id = *(_otherChecksIt++); - WardenCheck const& check = sWardenCheckMgr->GetCheckDataById(id); + WardenCheck const& check = sWardenCheckMgr->GetCheckData(id); if (!check.Str.empty()) { buff << uint8(check.Str.size()); @@ -242,7 +242,7 @@ void WardenWin::RequestChecks() for (uint16 const id : _currentChecks) { - WardenCheck const& check = sWardenCheckMgr->GetCheckDataById(id); + WardenCheck const& check = sWardenCheckMgr->GetCheckData(id); WardenCheckType const type = check.Type; buff << uint8(type ^ xorByte); @@ -370,7 +370,7 @@ void WardenWin::HandleCheckResult(ByteBuffer &buff) uint16 checkFailed = 0; for (uint16 const id : _currentChecks) { - WardenCheck const& check = sWardenCheckMgr->GetCheckDataById(id); + WardenCheck const& check = sWardenCheckMgr->GetCheckData(id); switch (check.Type) { @@ -389,9 +389,12 @@ void WardenWin::HandleCheckResult(ByteBuffer &buff) std::vector<uint8> response; response.resize(check.Length); buff.read(response.data(), response.size()); - if (response != sWardenCheckMgr->GetCheckResultById(id)) + WardenCheckResult const& expected = sWardenCheckMgr->GetCheckResult(id); + if (response != expected) { TC_LOG_DEBUG("warden", "RESULT MEM_CHECK fail CheckId %u account Id %u", id, _session->GetAccountId()); + TC_LOG_DEBUG("warden", "Expected: %s", ByteArrayToHexStr(expected).c_str()); + TC_LOG_DEBUG("warden", "Got: %s", ByteArrayToHexStr(response).c_str()); checkFailed = id; continue; } @@ -422,7 +425,7 @@ void WardenWin::HandleCheckResult(ByteBuffer &buff) if (Lua_Result != 0) { uint8 luaStrLen = buff.read<uint8>(); - if (luaStrLen != 0) + if (luaStrLen == 0) { std::string str; str.resize(luaStrLen); @@ -451,7 +454,7 @@ void WardenWin::HandleCheckResult(ByteBuffer &buff) std::vector<uint8> result; result.resize(Trinity::Crypto::SHA1::DIGEST_LENGTH); buff.read(result.data(), result.size()); - if (result != sWardenCheckMgr->GetCheckResultById(id)) // SHA1 + if (result != sWardenCheckMgr->GetCheckResult(id)) // SHA1 { TC_LOG_DEBUG("warden", "RESULT MPQ_CHECK fail, CheckId %u account Id %u", id, _session->GetAccountId()); checkFailed = id; @@ -468,7 +471,7 @@ void WardenWin::HandleCheckResult(ByteBuffer &buff) if (checkFailed > 0) { - WardenCheck const& check = sWardenCheckMgr->GetCheckDataById(checkFailed); + WardenCheck const& check = sWardenCheckMgr->GetCheckData(checkFailed); char const* penalty = ApplyPenalty(&check); TC_LOG_WARN("warden", "%s failed Warden check %u (%s). Action: %s", _session->GetPlayerInfo().c_str(), checkFailed, EnumUtils::ToConstant(check.Type), penalty); } |