mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10659] Fixed mistake in [10653] that causes player to fall from the transport at teleporting to another map

Browse source
This commit is contained in:
SilverIce 2010-10-31 12:15:32 +02:00
parent 506e93d15d
commit 1370ead743
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/game/MovementHandler.cpp
View file

@ -518,16 +518,19 @@ void WorldSession::HandleMoverRelocation(MovementInfo& movementInfo, Unit* mover
if (plMover) if (plMover)
{ {
if (movementInfo.HasMovementFlag(MOVEFLAG_ONTRANSPORT) && !plMover->m_transport) if (movementInfo.HasMovementFlag(MOVEFLAG_ONTRANSPORT))
{ {
// elevators also cause the client to send MOVEFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list if (!plMover->m_transport)
for (MapManager::TransportSet::const_iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
{ {
if ((*iter)->GetObjectGuid() == movementInfo.GetTransportGuid()) // elevators also cause the client to send MOVEFLAG_ONTRANSPORT - just unmount if the guid can be found in the transport list
for (MapManager::TransportSet::const_iterator iter = sMapMgr.m_Transports.begin(); iter != sMapMgr.m_Transports.end(); ++iter)
{ {
plMover->m_transport = (*iter); if ((*iter)->GetObjectGuid() == movementInfo.GetTransportGuid())
(*iter)->AddPassenger(plMover); {
break; plMover->m_transport = (*iter);
(*iter)->AddPassenger(plMover);
break;
}
} }
} }
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10658" #define REVISION_NR "10659"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__