diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-11-28 15:42:32 +0100 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-11-28 15:42:32 +0100 |
| commit | 059d4f52a3efd8695ec1e10c31959e24e50185c4 (patch) | |
| tree | 64fbe879c99c031aca1fbcae26d3ac0feeae8abc /src/server/game | |
| parent | 487da95a924458acf323e8d99b4c87b15f6d0ed5 (diff) | |
| parent | 0b4b853a0530be6c2557dbc9f46ab61c0767f0cc (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Diffstat (limited to 'src/server/game')
| -rwxr-xr-x | src/server/game/Entities/Transport/Transport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index f48d5ed631a..47ac5d57e00 100755 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -664,9 +664,9 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y, return 0; } - creature->m_isWorldObject = true; //so it will not be unloaded with grid map->AddToMap(creature); m_NPCPassengerSet.insert(creature); + creature->SetWorldObject(true); //so it will not be unloaded with grid if (tguid == 0) { |