diff options
| author | Malcrom <malcromdev@gmail.com> | 2012-02-16 11:56:12 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2012-02-16 11:56:12 -0330 |
| commit | f39724b5f3b265dd77cf662751aab3cd7df24a3d (patch) | |
| tree | 5bae802e3f9c1d0fab8e9bdc35d64e78ec346e72 /src/server/game/Maps/Map.cpp | |
| parent | be5715bb60f4fb93d5b8082288ffcdd30649210d (diff) | |
| parent | ba4d1c36f1b947f17ffc394afac11e9fb42d0b9b (diff) | |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rwxr-xr-x | src/server/game/Maps/Map.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 39f695c0868..dc0eb2dd857 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -666,10 +666,11 @@ void Map::RemovePlayerFromMap(Player* player, bool remove) ASSERT(remove); //maybe deleted in logoutplayer when player is not in a map if (remove) + { DeleteFromWorld(player); - if (remove) sScriptMgr->OnPlayerLeaveMap(this, player); + } } template<class T> @@ -2374,7 +2375,7 @@ bool InstanceMap::AddPlayerToMap(Player* player) if (uint32 dungeonId = sLFGMgr->GetDungeon(group->GetGUID(), true)) if (LFGDungeonEntry const* dungeon = sLFGDungeonStore.LookupEntry(dungeonId)) if (LFGDungeonEntry const* randomDungeon = sLFGDungeonStore.LookupEntry(*(sLFGMgr->GetSelectedDungeons(player->GetGUID()).begin()))) - if (dungeon->map == GetId() && dungeon->difficulty == GetDifficulty() && randomDungeon->type == LFG_TYPE_RANDOM) + if (uint32(dungeon->map) == GetId() && dungeon->difficulty == GetDifficulty() && randomDungeon->type == LFG_TYPE_RANDOM) player->CastSpell(player, LFG_SPELL_LUCK_OF_THE_DRAW, true); } |