diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-03-12 15:53:22 +0100 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-03-12 16:09:45 +0100 |
| commit | fa8c0dd534723a573268ccd8bb40c0846cb35936 (patch) | |
| tree | 81a685fbc3a1720476f5127032a79263e401ea98 /src/server/game/Conditions/DisableMgr.cpp | |
| parent | f6d3a5b9b98b8f422588694a2197adacea62c675 (diff) | |
Revert "Core/AuctionHouse: use DisableMgr to disable specific items (#19289)"
This reverts commit f6d3a5b9b98b8f422588694a2197adacea62c675.
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index c08e2a609c4..d939db03255 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -47,7 +47,7 @@ namespace DisableMap m_DisableMap; - uint8 MAX_DISABLE_TYPES = 10; + uint8 MAX_DISABLE_TYPES = 9; } void LoadDisables() @@ -256,20 +256,6 @@ void LoadDisables() } break; } - case DISABLE_TYPE_ITEM: - { - if (!sObjectMgr->GetItemTemplate(entry)) - { - TC_LOG_ERROR("sql.sql", "Item entry %u from `disables` doesn't exist in item_template, skipped.", entry); - continue; - } - if (!flags || flags > MAX_ITEM_DISABLE_TYPE) - { - TC_LOG_ERROR("sql.sql", "Disable flags for item %u are invalid, skipped.", entry); - continue; - } - break; - } default: break; } @@ -410,7 +396,6 @@ bool IsDisabledFor(DisableType type, uint32 entry, WorldObject const* ref, uint8 case DISABLE_TYPE_MMAP: return true; case DISABLE_TYPE_VMAP: - case DISABLE_TYPE_ITEM: return (flags & itr->second.flags) != 0; } |