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

[7136] Check mount existance at loading not completed taxi path at login.

Browse source
This commit is contained in:
VladimirMangos 2009-01-21 19:40:19 +03:00
parent d9d30fd40e
commit 6bc449d053
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/Player.cpp
View file

@ -190,7 +190,7 @@ void PlayerTaxi::AppendTaximaskTo( ByteBuffer& data, bool all )
} }
} }
bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values ) bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values, uint32 team )
{ {
ClearTaxiDestinations(); ClearTaxiDestinations();
@ -218,6 +218,10 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values )
return false; return false;
} }
// can't load taxi path without mount set (quest taxi path?)
if(!objmgr.GetTaxiMount(GetTaxiSource(),team))
return false;
return true; return true;
} }
@ -14364,7 +14368,7 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
} }
// Not finish taxi flight path // Not finish taxi flight path
if(!m_taxi.LoadTaxiDestinationsFromString(taxi_nodes)) if(!m_taxi.LoadTaxiDestinationsFromString(taxi_nodes,GetTeam()))
{ {
// problems with taxi path loading // problems with taxi path loading
TaxiNodesEntry const* nodeEntry = NULL; TaxiNodesEntry const* nodeEntry = NULL;

2
src/game/Player.h
View file

@ -938,7 +938,7 @@ class MANGOS_DLL_SPEC PlayerTaxi
void AppendTaximaskTo(ByteBuffer& data,bool all); void AppendTaximaskTo(ByteBuffer& data,bool all);
// Destinations // Destinations
bool LoadTaxiDestinationsFromString(const std::string& values); bool LoadTaxiDestinationsFromString(const std::string& values, uint32 team);
std::string SaveTaxiDestinationsToString(); std::string SaveTaxiDestinationsToString();
void ClearTaxiDestinations() { m_TaxiDestinations.clear(); } void ClearTaxiDestinations() { m_TaxiDestinations.clear(); }

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 "7135" #define REVISION_NR "7136"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__