[mr3179] Fix combat state setting when FFA PvP flag is set

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

You should get the PvP-In-Combat delay 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 stopping combat, the combat state will switch off immediately. But it is supposed to switch off after some delay, because it was a PvP fight.

Ported from TC, author Elron103.
[mr3180] Don't use glow vision during arena preparation
Merge branch 'master' of https://github.com/mangosR2/mangos