Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
commit
6161f69b7e
17 files changed
+260
-96
No files matched your search
@@ -1007,7 +1007,7 @@ bool SpellInfo::IsLootCrafting() const
|
||||
return (Effects[0].Effect == SPELL_EFFECT_CREATE_RANDOM_ITEM ||
|
||||
// different random cards from Inscription (121==Virtuoso Inking Set category) r without explicit item
|
||||
(Effects[0].Effect == SPELL_EFFECT_CREATE_ITEM_2 &&
|
||||
(TotemCategory[0] != 0 || Effects[0].ItemType == 0)));
|
||||
((TotemCategory[0] != 0 || (Totem[0] != 0 && SpellIconID == 1)) || Effects[0].ItemType == 0)));
|
||||
}
|
||||
|
||||
bool SpellInfo::IsQuestTame() const
|
||||
|
||||
Reference in new issue
Block a user