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
@@ -601,17 +601,13 @@ public:
|
||||
|
||||
// Update in memory..
|
||||
if (CreatureTemplate const* cinfo = creature->GetCreatureTemplate())
|
||||
{
|
||||
const_cast<CreatureTemplate*>(cinfo)->faction_A = factionId;
|
||||
const_cast<CreatureTemplate*>(cinfo)->faction_H = factionId;
|
||||
}
|
||||
const_cast<CreatureTemplate*>(cinfo)->faction = factionId;
|
||||
|
||||
// ..and DB
|
||||
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_FACTION);
|
||||
|
||||
stmt->setUInt16(0, uint16(factionId));
|
||||
stmt->setUInt16(1, uint16(factionId));
|
||||
stmt->setUInt32(2, creature->GetEntry());
|
||||
stmt->setUInt32(1, creature->GetEntry());
|
||||
|
||||
WorldDatabase.Execute(stmt);
|
||||
|
||||
|
||||
Reference in new issue
Block a user