TrinityCore/TrinityCore — pull request #11103 by Elron103 (2013-10-23 13:22:34+00:00)
Title: Core/Entities: Fix combat state setting when FFA PvP flag is set

Description:
Currently there is an issue, when you are in FFA areas, but you dont have PvP flag activated.

You should get the 5 seconds PvP-In-Combat timer, but instead you just get the usual timer as if you would not fight in PvP.

Reproduction:
1) Get two players in FFA area Gurubashi arena down in the battle area (.tele Gurubashi)

2) Fight each other

3) When forcing to leave combat, the combat will stop immediately. But it is supposed to stop after some delay, because it was a PvP fight.

Environment:
Tested it under Win with:
TC: 895a23d
DB: TDB 52