aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/game/Entities/Vehicle/Vehicle.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 924b52de044..20110a555cd 100755
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -744,12 +744,13 @@ void Vehicle::RemovePendingEvent(VehicleJoinEvent* e)
void Vehicle::RemovePendingEventsForSeat(uint8 seatId)
{
- for (std::deque<VehicleJoinEvent*>::iterator itr = _pendingJoinEvents.begin(); itr != _pendingJoinEvents.end(); ++itr)
+ for (std::deque<VehicleJoinEvent*>::iterator itr = _pendingJoinEvents.begin(); itr != _pendingJoinEvents.end();)
{
+ std::deque<VehicleJoinEvent*>::iterator cur = itr++;
if (uint8((*itr)->Seat->first) == seatId)
{
(*itr)->to_Abort = true;
- _pendingJoinEvents.erase(itr);
+ _pendingJoinEvents.erase(cur);
}
}
}