Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Vehicles: Really make RemovePendingEventsForSeat iterating crash safe

Browse Source
This commit is contained in:
Shauren
2013-02-23 16:05:08 +01:00
parent 7cab6d308a
commit daced24223
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Entities/Vehicle/Vehicle.cpp
View File

@@ -742,16 +742,17 @@ void Vehicle::RemovePendingEvent(VehicleJoinEvent* e)
* @param seatId Identifier for the seat.
*/
void Vehicle::RemovePendingEventsForSeat(uint8 seatId)
void Vehicle::RemovePendingEventsForSeat(int8 seatId)
{
for (std::deque<VehicleJoinEvent*>::iterator itr = _pendingJoinEvents.begin(); itr != _pendingJoinEvents.end();)
{
std::deque<VehicleJoinEvent*>::iterator cur = itr++;
if (uint8((*itr)->Seat->first) == seatId)
if ((*itr)->Seat->first == seatId)
{
(*itr)->to_Abort = true;
_pendingJoinEvents.erase(cur);
_pendingJoinEvents.erase(itr++);
}
else
++itr;
}
}
@@ -775,7 +776,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
ASSERT(Passenger->IsInWorld());
ASSERT(Target->GetBase()->IsInWorld());
Target->RemovePendingEventsForSeat(uint8(Seat->first));
Target->RemovePendingEventsForSeat(Seat->first);
Passenger->m_vehicle = Target;
Seat->second.Passenger = Passenger->GetGUID();

2
src/server/game/Entities/Vehicle/Vehicle.h
View File

@@ -96,7 +96,7 @@ class Vehicle : public TransportBase
void CancelJoinEvent(VehicleJoinEvent* e);
void RemovePendingEvent(VehicleJoinEvent* e);
void RemovePendingEventsForSeat(uint8 seatId);
void RemovePendingEventsForSeat(int8 seatId);
private:
Unit* _me; ///< The underlying unit with the vehicle kit. Can be player or creature.