Core/Misc: resolved more cherrypick mistakes

src/server/game/Entities/Transport/Transport.cpp

@@ -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);

src/server/game/Movement/Spline/Spline.h

@@ -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;

src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp

@@ -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));