Core/Vehicles: Removed hacky setting entry for multi-passenger mounts

Core/Pools: Fixed compile

--HG--
branch : trunk

src/server/game/Entities/Unit/Unit.cpp

@@ -11843,9 +11843,9 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT);
 
     // unsummon pet
-    if (GetTypeId() == TYPEID_PLAYER)
+    if (Player* plr = ToPlayer())
     {
-        Pet* pet = this->ToPlayer()->GetPet();
+        Pet* pet = plr->GetPet();
         if (pet)
         {
             Battleground *bg = ToPlayer()->GetBattleground();
@@ -11853,31 +11853,26 @@ void Unit::Mount(uint32 mount, uint32 VehicleId, uint32 creatureEntry)
             if (bg && bg->isArena())
                 pet->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
             else
-                this->ToPlayer()->UnsummonPetTemporaryIfAny();
+                plr->UnsummonPetTemporaryIfAny();
         }
 
-        if (VehicleId != 0)
+        if (VehicleId)
         {
-            if (sVehicleStore.LookupEntry(VehicleId))
+            if (CreateVehicleKit(VehicleId))
             {
+                GetVehicleKit()->Reset();
 
-                if (CreateVehicleKit(VehicleId))
-                {
-                    GetVehicleKit()->Reset();
+                // mounts can also have accessories
+                GetVehicleKit()->InstallAllAccessories(creatureEntry);
 
-                    // mounts can also have accessories
-                    GetVehicleKit()->GetBase()->SetEntry(creatureEntry); // set creature entry so InstallAllAccessories() can read correct accessories
-                    GetVehicleKit()->InstallAllAccessories();
+                // Send others that we now have a vehicle
+                WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, GetPackGUID().size()+4);
+                data.appendPackGUID(GetGUID());
+                data << uint32(VehicleId);
+                SendMessageToSet(&data,true);
 
-                    // Send others that we now have a vehicle
-                    WorldPacket data(SMSG_PLAYER_VEHICLE_DATA, GetPackGUID().size()+4);
-                    data.appendPackGUID(GetGUID());
-                    data << uint32(VehicleId);
-                    SendMessageToSet(&data,true);
-
-                    data.Initialize(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA, 0);
-                    this->ToPlayer()->GetSession()->SendPacket(&data);
-                }
+                data.Initialize(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA, 0);
+                plr->GetSession()->SendPacket(&data);
             }
         }
     }
@@ -16668,21 +16663,20 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
         }
     }
 
-    if (GetTypeId() == TYPEID_PLAYER)
+    if (Player* plr = ToPlayer())
     {
-        if (vehicle->GetBase()->GetTypeId() == TYPEID_PLAYER && this->ToPlayer()->isInCombat())
+        if (vehicle->GetBase()->GetTypeId() == TYPEID_PLAYER && plr->isInCombat())
             return;
 
-        this->ToPlayer()->InterruptNonMeleeSpells(false);
-        this->ToPlayer()->StopCastingCharm();
-        this->ToPlayer()->StopCastingBindSight();
-        this->ToPlayer()->Unmount();
-        this->ToPlayer()->RemoveAurasByType(SPELL_AURA_MOUNTED);
+        InterruptNonMeleeSpells(false);
+        plr->StopCastingCharm();
+        plr->StopCastingBindSight();
+        Unmount();
+        RemoveAurasByType(SPELL_AURA_MOUNTED);
 
         // drop flag at invisible in bg
-        if (this->ToPlayer()->InBattleground())
-            if (Battleground *bg = this->ToPlayer()->GetBattleground())
-          bg->EventPlayerDroppedFlag(this->ToPlayer());
+        if (Battleground *bg = plr->GetBattleground())
+            bg->EventPlayerDroppedFlag(plr);
     }
 
     ASSERT(!m_vehicle);

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

@@ -115,9 +115,9 @@ void Vehicle::Install()
         sScriptMgr.OnInstall(this);
 }
 
-void Vehicle::InstallAllAccessories()
+void Vehicle::InstallAllAccessories(uint32 entry)
 {
-    VehicleAccessoryList const* mVehicleList = sObjectMgr.GetVehicleAccessoryList(me->GetEntry());
+    VehicleAccessoryList const* mVehicleList = sObjectMgr.GetVehicleAccessoryList(entry);
     if (!mVehicleList)
         return;
 
@@ -163,7 +163,7 @@ void Vehicle::Reset()
     }
     else
     {
-        InstallAllAccessories();
+        InstallAllAccessories(me->GetEntry());
         if (m_usableSeatNum)
             me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
     }

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

@@ -71,7 +71,7 @@ class Vehicle
         void Uninstall();
         void Reset();
         void Die();
-        void InstallAllAccessories();
+        void InstallAllAccessories(uint32 entry);
 
         Unit *GetBase() const { return me; }
         VehicleEntry const *GetVehicleInfo() { return m_vehicleInfo; }