Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
This commit is contained in:
Vincent_Michael committed 2014-01-13 20:34:21 +01:00
commit cc85d1b5b7
28 files changed
+405 -190

No files matched your search

+1 -1
View File
@@ -9935,7 +9935,7 @@ bool Unit::IsServiceProvider() const
void Unit::SetInCombatWith(Unit* enemy)
{
Unit* eOwner = enemy->GetCharmerOrOwnerOrSelf();
if (eOwner->IsPvP())
if (eOwner->IsPvP() || eOwner->IsFFAPvP())
{
SetInCombatState(true, enemy);
return;