Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AuctionHouse/AuctionHouseMgr.h src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Handlers/NPCHandler.cpp
This commit is contained in:
commit
0bebf40fe7
2824 files changed
+1553
-406
No files matched your search
@@ -496,10 +496,10 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
|
||||
* @param [in, out] unit The passenger to remove.
|
||||
*/
|
||||
|
||||
void Vehicle::RemovePassenger(Unit* unit)
|
||||
Vehicle* Vehicle::RemovePassenger(Unit* unit)
|
||||
{
|
||||
if (unit->GetVehicle() != this)
|
||||
return;
|
||||
return NULL;
|
||||
|
||||
SeatMap::iterator seat = GetSeatIteratorForPassenger(unit);
|
||||
ASSERT(seat != Seats.end());
|
||||
@@ -517,11 +517,7 @@ void Vehicle::RemovePassenger(Unit* unit)
|
||||
_me->RemoveCharmedBy(unit);
|
||||
|
||||
if (_me->IsInWorld())
|
||||
{
|
||||
unit->m_movementInfo.t_pos.Relocate(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
unit->m_movementInfo.t_time = 0;
|
||||
unit->m_movementInfo.t_seat = 0;
|
||||
}
|
||||
unit->m_movementInfo.ClearTransport();
|
||||
|
||||
// only for flyable vehicles
|
||||
if (unit->IsFlying())
|
||||
@@ -532,6 +528,9 @@ void Vehicle::RemovePassenger(Unit* unit)
|
||||
|
||||
if (GetBase()->GetTypeId() == TYPEID_UNIT)
|
||||
sScriptMgr->OnRemovePassenger(this, unit);
|
||||
|
||||
unit->SetVehicle(NULL);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -803,7 +802,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
|
||||
|
||||
Target->RemovePendingEventsForSeat(Seat->first);
|
||||
|
||||
Passenger->m_vehicle = Target;
|
||||
Passenger->SetVehicle(Target);
|
||||
Seat->second.Passenger = Passenger->GetGUID();
|
||||
if (Seat->second.SeatInfo->CanEnterOrExit())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user