This reverts commit f580cddc09.

src/server/game/Entities/Vehicle/Vehicle.cpp

@@ -178,13 +178,8 @@ void Vehicle::ApplyAllImmunities()
     // Different immunities for vehicles goes below
     switch (GetVehicleInfo()->m_ID)
     {
-        case 160: //Isle of conquest turret
-        case 244: //Wintergrasp turret
+        case 160:
             _me->SetControlled(true, UNIT_STAT_ROOT);
-            //me->AddUnitMovementFlag(MOVEMENTFLAG_ROOT);
-            //me->SetSpeed(MOVE_TURN_RATE, 0.7f);
-            //me->SetSpeed(MOVE_PITCH_RATE, 0.7f);
-            //me->m_movementInfo.flags2=59;
             _me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_DECREASE_SPEED, true);
             break;
         default:
@@ -469,20 +464,6 @@ void Vehicle::Dismiss()
     _me->AddObjectToRemoveList();
 }
 
-void Vehicle::TeleportVehicle(float x, float y, float z, float ang)
-{
-    vehiclePlayers.clear();
-    for(int8 i = 0; i < 8; i++)
-        if (Unit* player = GetPassenger(i))
-            vehiclePlayers.insert(player->GetGUID());
-
-    RemoveAllPassengers(); // this can unlink Guns from Siege Engines
-    _me->NearTeleportTo(x, y, z, ang);
-    for (GuidSet::const_iterator itr = vehiclePlayers.begin(); itr != vehiclePlayers.end(); ++itr)
-        if(Unit* plr = sObjectAccessor->FindUnit(*itr))
-                plr->NearTeleportTo(x, y, z, ang);
-}
-
 void Vehicle::InitMovementInfoForBase()
 {
     uint32 vehicleFlags = GetVehicleInfo()->m_flags;

src/server/game/Entities/Vehicle/Vehicle.h

@@ -98,7 +98,6 @@ struct VehicleAccessory
 typedef std::vector<VehicleAccessory> VehicleAccessoryList;
 typedef std::map<uint32, VehicleAccessoryList> VehicleAccessoryMap;
 typedef std::map<int8, VehicleSeat> SeatMap;
-typedef std::set<uint64> GuidSet;
 
 class Vehicle
 {
@@ -130,7 +129,6 @@ class Vehicle
         void RelocatePassengers(float x, float y, float z, float ang);
         void RemoveAllPassengers();
         void Dismiss();
-        void TeleportVehicle(float x, float y, float z, float ang);
         bool IsVehicleInUse() { return Seats.begin() != Seats.end(); }
 
         SeatMap Seats;
@@ -146,7 +144,6 @@ class Vehicle
 
         Unit* _me;
         VehicleEntry const* _vehicleInfo;
-        GuidSet vehiclePlayers;
         uint32 _usableSeatNum;         // Number of seats that match VehicleSeatEntry::UsableByPlayer, used for proper display flags
         uint32 _creatureEntry;         // Can be different than me->GetBase()->GetEntry() in case of players
 };