diff options
| -rw-r--r-- | src/server/bnetserver/Server/Session.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/StatSystem.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp index 163640a3051..bb0a92740e0 100644 --- a/src/server/bnetserver/Server/Session.cpp +++ b/src/server/bnetserver/Server/Session.cpp @@ -531,7 +531,7 @@ void Battlenet::Session::ReadHandler() if (stream.Read<bool>(1)) header.Channel = stream.Read<int32>(4); - if (header.Channel != AUTHENTICATION && !_authed) + if (header.Channel != AUTHENTICATION && (header.Channel != CONNECTION || header.Opcode != Connection::CMSG_PING) && !_authed) { TC_LOG_DEBUG("session.packets", "%s Received not allowed %s. Client has not authed yet.", GetClientInfo().c_str(), header.ToString().c_str()); CloseSocket(); diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 6014a4b54dc..e9af35ff952 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -256,16 +256,14 @@ void Player::UpdateArmor() float Player::GetHealthBonusFromStamina() { - // Taken from PaperDollFrame.lua - 4.3.4.15595 + // Taken from PaperDollFrame.lua - 6.0.3.19085 float ratio = 10.0f; if (gtOCTHpPerStaminaEntry const* hpBase = sGtOCTHpPerStaminaStore.EvaluateTable(getLevel() - 1, 0)) ratio = hpBase->ratio; float stamina = GetStat(STAT_STAMINA); - float baseStam = std::min(20.0f, stamina); - float moreStam = stamina - baseStam; - return baseStam + moreStam * ratio; + return stamina * ratio; } float Player::GetManaBonusFromIntellect() |