Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/Protocol/Opcodes.h src/server/scripts/Commands/cs_misc.cpp
This commit is contained in:
commit
adb78862da
79 files changed
+3922
-1330
No files matched your search
@@ -207,13 +207,8 @@ namespace Movement
|
||||
Vector3 TransportPathTransform::operator()(Vector3 input)
|
||||
{
|
||||
if (_transformForTransport)
|
||||
{
|
||||
if (TransportBase* transport = _owner->GetDirectTransport())
|
||||
{
|
||||
float unused = 0.0f; // need reference
|
||||
transport->CalculatePassengerOffset(input.x, input.y, input.z, unused);
|
||||
}
|
||||
}
|
||||
transport->CalculatePassengerOffset(input.x, input.y, input.z);
|
||||
|
||||
return input;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user