diff options
| author | NoName <322016+Faq@users.noreply.github.com> | 2020-05-24 21:35:34 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-06 19:05:04 +0100 |
| commit | a4b3e694e822315a635b9ea598d1fab9e2069c3d (patch) | |
| tree | 6e864b6420a10f6e689f8f61e850234c43614809 /src/server/game/Handlers/MiscHandler.cpp | |
| parent | ecf0bef1111f75b961a6af8bc730c7ee6ec64b37 (diff) | |
Entities/Player: Restore old checks for UpdatePvPFlag (#24372)
Partly revert 671052575a36624b06379ee5e13a7fea26870194
+ implemented timer reset to 300s after relog never worked, therefore removing that part;
+ reverting other parts with 300s timer changes, as not needed;
(cherry picked from commit 2efaf1dda8ce19533b1d99e030ac25a0de5735b4)
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 5f17946132d..a2c812f1a84 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -325,7 +325,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() + 300; // start toggle-off + GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime(); // start toggle-off } } @@ -343,7 +343,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() + 300; // start toggle-off + GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime(); // start toggle-off } } |