Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: sql/updates/world/2012_09_09_02_world_spell_script_names.sql src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp
This commit is contained in:
commit
d6743c7c95
15 files changed
+144
-27
No files matched your search
@@ -415,8 +415,8 @@ void Unit::UpdateSplinePosition()
|
||||
loc.z += vehicle->GetPositionZMinusOffset();
|
||||
loc.orientation = vehicle->GetOrientation();
|
||||
}
|
||||
else if (Transport* trans = GetTransport())
|
||||
trans->CalculatePassengerPosition(loc.x, loc.y, loc.z, loc.orientation);
|
||||
else if (TransportBase* transport = GetDirectTransport())
|
||||
transport->CalculatePassengerPosition(loc.x, loc.y, loc.z, loc.orientation);
|
||||
}
|
||||
|
||||
UpdatePosition(loc.x, loc.y, loc.z, loc.orientation);
|
||||
@@ -15557,6 +15557,13 @@ uint64 Unit::GetTransGUID() const
|
||||
return 0;
|
||||
}
|
||||
|
||||
TransportBase* Unit::GetDirectTransport() const
|
||||
{
|
||||
if (Vehicle* veh = GetVehicle())
|
||||
return veh;
|
||||
return GetTransport();
|
||||
}
|
||||
|
||||
bool Unit::IsInPartyWith(Unit const* unit) const
|
||||
{
|
||||
if (this == unit)
|
||||
|
||||
Reference in new issue
Block a user