diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 | ||||
| -rw-r--r-- | src/game/Vehicle.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 54fb21d334b..d9e4e0a7c74 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -3287,7 +3287,7 @@ void Spell::EffectSummonType(uint32 i) if(!vehicle) return; - vehicle->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, m_caster->GetGUID()); + //vehicle->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, m_caster->GetGUID()); vehicle->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id); break; } diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp index b4f93331cfb..9dd36895d56 100644 --- a/src/game/Vehicle.cpp +++ b/src/game/Vehicle.cpp @@ -71,7 +71,10 @@ void Vehicle::setDeathState(DeathState s) // overwrite vir { if(Unit *passenger = itr->second.passenger) if(passenger->GetTypeId() == TYPEID_UNIT && ((Creature*)passenger)->isVehicle()) + { + passenger->ExitVehicle(); ((Vehicle*)passenger)->setDeathState(s); + } } RemoveAllPassengers(); } @@ -298,7 +301,10 @@ void Vehicle::Dismiss() { if(Unit *passenger = itr->second.passenger) if(passenger->GetTypeId() == TYPEID_UNIT && ((Creature*)passenger)->isVehicle()) + { + passenger->ExitVehicle(); ((Vehicle*)passenger)->Dismiss(); + } } RemoveAllPassengers(); SendObjectDeSpawnAnim(GetGUID()); |