Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-19 00:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: resolved more cherrypick mistakes

Browse Source
This commit is contained in:
Ovahlord
2022-06-19 00:07:09 +02:00
parent 5a236799c2
commit aa0b4ab7f5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Transport/Transport.cpp
View File

@@ -650,8 +650,6 @@ void Transport::DelayedTeleportTransport()
PassengerSet passengersToTeleport = _passengers;
for (WorldObject* obj : passengersToTeleport)
{
WorldObject* obj = (*_passengerTeleportItr++);
float destX, destY, destZ, destO;
obj->m_movementInfo.transport.pos.GetPosition(destX, destY, destZ, destO);
TransportBase::CalculatePassengerPosition(destX, destY, destZ, &destO, x, y, z, o);

2
src/server/game/Movement/Spline/Spline.h
View File

@@ -160,6 +160,8 @@ public:
@param t - percent of spline's length, assumes that t in range [0, 1]. */
void evaluate_derivative(float t, Vector3& hermite) const;
using SplineBase::evaluate_derivative;
// Assumes that t in range [0, 1]
index_type computeIndexInBounds(float t) const;
void computeIndex(float t, index_type& out_idx, float& out_u) const;

2
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -750,7 +750,7 @@ class instance_icecrown_citadel : public InstanceMapScript
if (GameObject* teleporter = instance->GetGameObject(TeleporterRampartsGUID))
SetTeleporterState(teleporter, true);
if (Transport* elevator = instance->GetTransport(LadyDeathwisperElevatorGUID))
if (GameObject* elevator = instance->GetGameObject(LadyDeathwisperElevatorGUID))
{
elevator->SetGoState(GO_STATE_TRANSPORT_ACTIVE);
elevator->HandleCustomTypeCommand(GameObjectType::SetTransportAutoCycleBetweenStopFrames(true));