diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-23 08:33:13 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-23 08:33:13 -0500 |
| commit | 3869bb7b3a96751b463ecec2d9ac663b792a0703 (patch) | |
| tree | 330d7e96fa4021f6301d488d64ac6eed717172ab /src/server/scripts/Spells | |
| parent | d40cbe0113329de96723e8fe015651c919760a15 (diff) | |
| parent | 143340b38c857b2cc50ee9f8577abf9248b6317a (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index c8ae44d9cd9..c8f3236a008 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1418,7 +1418,7 @@ class spell_gen_luck_of_the_draw : public SpellScriptLoader if (group->isLFGGroup()) if (uint32 dungeonId = sLFGMgr->GetDungeon(group->GetGUID(), true)) if (LFGDungeonData const* dungeon = sLFGMgr->GetLFGDungeon(dungeonId)) - if (uint32(dungeon->map) == map->GetId() && dungeon->difficulty == uint32(map->GetDifficulty())) + if (uint32(dungeon->map) == map->GetId() && dungeon->difficulty == map->GetDifficulty()) if (randomDungeon && randomDungeon->type == LFG_TYPE_RANDOM) return; // in correct dungeon |