Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/Achievements/AchievementMgr.cpp
This commit is contained in:
commit
d5163d846f
40 files changed
+603
-93
No files matched your search
@@ -195,9 +195,11 @@ namespace Movement
|
||||
{
|
||||
if (_transformForTransport)
|
||||
{
|
||||
float unused = 0.0f;
|
||||
if (TransportBase* transport = _owner.GetDirectTransport())
|
||||
{
|
||||
float unused = 0.0f; // need reference
|
||||
transport->CalculatePassengerOffset(input.x, input.y, input.z, unused);
|
||||
}
|
||||
}
|
||||
|
||||
return input;
|
||||
|
||||
Reference in new issue
Block a user