diff options
| author | megamage <none@none> | 2009-08-23 00:43:49 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-08-23 00:43:49 -0500 |
| commit | db066046df2272b98f478a7072067a41fe69905f (patch) | |
| tree | f92bbb74a08e1932e295a34ceaa8047db76ad813 /src | |
| parent | 7c720763558fbf4a35755b6055e6a127326834a5 (diff) | |
*Do not always set faction in summonvehicle function.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Object.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 1d2aeabd132..4b79da91651 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1855,7 +1855,7 @@ Vehicle* WorldObject::SummonVehicle(uint32 entry, float x, float y, float z, flo if(isType(TYPEMASK_UNIT)) { v->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, GetGUID()); - v->setFaction(((Unit*)this)->getFaction()); + //v->setFaction(((Unit*)this)->getFaction()); } map->Add((Creature*)v); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 1bf46269461..997417c158c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -3386,8 +3386,7 @@ void Spell::EffectSummonType(uint32 i) // this is for wintergrasp, need to find a better way // in the future, we can just use getsummoner //vehicle->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, m_originalCasterGUID); - //if(m_originalCaster) - // vehicle->setFaction(m_originalCaster->getFaction()); + vehicle->setFaction(m_originalCaster->getFaction()); vehicle->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id); break; } @@ -3481,7 +3480,7 @@ void Spell::EffectSummonType(uint32 i) return; //vehicle->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, m_caster->GetGUID()); - //vehicle->setFaction(m_caster->getFaction()); + vehicle->setFaction(m_caster->getFaction()); vehicle->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id); if(damage) |