diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-08 13:04:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-14 23:31:56 +0100 |
| commit | a5d8807af8cb0f257f81fa5cf3ac70769b677575 (patch) | |
| tree | cc78c859fbfa24c727d91ae6b1e234775a491fcd /src/server/game/Handlers/MiscHandler.cpp | |
| parent | 3ad5bc1e15574e1534fe60e06772d4b293cdf13c (diff) | |
Entities/Player: Properly restore PvP-enabled state on login
(cherry picked from commit 671052575a36624b06379ee5e13a7fea26870194)
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 3769220bc3e..0c7f5582ba1 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -318,7 +318,7 @@ void WorldSession::HandleTogglePvP(WorldPackets::Misc::TogglePvP& /*packet*/) GetPlayer()->RemovePlayerFlag(PLAYER_FLAGS_IN_PVP); GetPlayer()->AddPlayerFlag(PLAYER_FLAGS_PVP_TIMER); if (!GetPlayer()->pvpInfo.IsHostile && GetPlayer()->IsPvP()) - GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime(); // start toggle-off + GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime() + 300; // start toggle-off } else { @@ -336,7 +336,7 @@ void WorldSession::HandleSetPvP(WorldPackets::Misc::SetPvP& packet) GetPlayer()->RemovePlayerFlag(PLAYER_FLAGS_IN_PVP); GetPlayer()->AddPlayerFlag(PLAYER_FLAGS_PVP_TIMER); if (!GetPlayer()->pvpInfo.IsHostile && GetPlayer()->IsPvP()) - GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime(); // start toggle-off + GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime() + 300; // start toggle-off } else { |