Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Creature/Creature.h src/server/game/Globals/ObjectMgr.cpp src/server/scripts/Commands/cs_reload.cpp src/server/shared/Database/Implementation/WorldDatabase.cpp
This commit is contained in:
commit
f743ca2816
18 files changed
+248
-163
No files matched your search
@@ -14251,10 +14251,7 @@ void Unit::RestoreFaction()
|
||||
}
|
||||
|
||||
if (CreatureTemplate const* cinfo = ToCreature()->GetCreatureTemplate()) // normal creature
|
||||
{
|
||||
FactionTemplateEntry const* faction = GetFactionTemplateEntry();
|
||||
setFaction((faction && faction->friendlyMask & 0x004) ? cinfo->faction_H : cinfo->faction_A);
|
||||
}
|
||||
setFaction(cinfo->faction);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user