aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorNoName <322016+Faq@users.noreply.github.com>2020-05-24 21:35:34 +0300
committerGitHub <noreply@github.com>2020-05-24 20:35:34 +0200
commit2efaf1dda8ce19533b1d99e030ac25a0de5735b4 (patch)
treebb6999659f2cbd42c68fcdd6c6845bbc3345462c /src/server/game/Handlers/MiscHandler.cpp
parente0b0586afc97860ccbe24c40c0a5831fb880f876 (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;
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 1cd701e39ff..59dab6e70d2 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -452,7 +452,7 @@ void WorldSession::HandleTogglePvP(WorldPackets::Misc::TogglePvP& togglePvP)
else
{
if (!GetPlayer()->pvpInfo.IsHostile && GetPlayer()->IsPvP())
- GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime() + 300; // start toggle-off
+ GetPlayer()->pvpInfo.EndTimer = GameTime::GetGameTime(); // start toggle-off
}
}