araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 06:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14491 from doctaweeks/fixes-for-6.x

Browse Source 
Fixes for 6.x
This commit is contained in:
Carbenium
2015-04-05 00:16:36 +02:00
parent f09af70583 96c6ed1867
commit 6252330a77
59 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+2 -2
View File
@@ -21656,9 +21656,9 @@ void Player::SetPvP(bool state)
(*itr)->SetPvP(state);
}
void Player::UpdatePvP(bool state, bool override)
void Player::UpdatePvP(bool state, bool _override)
{
if (!state || override)
if (!state || _override)
{
SetPvP(state);
pvpInfo.EndTimer = 0;