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:
commit
cc85d1b5b7
28 files changed
+405
-190
No files matched your search
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user