araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-15 12:42:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Vincent-Michael
2014-04-28 09:42:20 +02:00
parent a4dc654aea 57cf043aec
commit f743ca2816
18 changed files with 248 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -261,11 +261,11 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{
if (CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate((*itr)->ToCreature()->GetEntry()))
{
if ((*itr)->ToCreature()->getFaction() != ci->faction_A)
if ((*itr)->ToCreature()->getFaction() != ci->faction)
{
(*itr)->ToCreature()->setFaction(ci->faction_A);
(*itr)->ToCreature()->setFaction(ci->faction);
TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u",
(*itr)->GetEntry(), (*itr)->GetGUIDLow(), ci->faction_A);
(*itr)->GetEntry(), (*itr)->GetGUIDLow(), ci->faction);
}
}
}