diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 5cbed1b3a64..4fb93a85fdf 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -340,7 +340,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) SeatMap::iterator seat; sLog->outDebug(LOG_FILTER_VEHICLES, "Unit %s scheduling enter vehicle entry %u id %u dbguid %u seat %d", unit->GetName().c_str(), _me->GetEntry(), _vehicleInfo->m_ID, _me->GetGUIDLow(), seatId); - VehicleJoinEvent* e = new VehicleJoinEvent(this, unit, seat); + VehicleJoinEvent* e = new VehicleJoinEvent(this, unit); unit->m_Events.AddEvent(e, unit->m_Events.CalculateTime(0)); _pendingJoinEvents.push_back(e); @@ -355,6 +355,8 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) CancelJoinEvent(e); return false; } + + e->Seat = seat; } else { @@ -365,6 +367,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) return false; } + e->Seat = seat; if (seat->second.Passenger) { if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), seat->second.Passenger)) diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index f8fa7f9b64a..25a68e0e511 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -109,12 +109,12 @@ class VehicleJoinEvent : public BasicEvent { friend class Vehicle; protected: - VehicleJoinEvent(Vehicle* v, Unit* u, SeatMap::iterator& itr) : Target(v), Passenger(u), Seat(itr) {} + VehicleJoinEvent(Vehicle* v, Unit* u) : Target(v), Passenger(u), Seat(Target->Seats.end()) {} bool Execute(uint64, uint32); void Abort(uint64); Vehicle* Target; Unit* Passenger; - SeatMap::iterator& Seat; + SeatMap::iterator Seat; }; #endif |