diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-02 05:50:35 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-02 05:50:35 +0200 |
| commit | 3545d60b7d70e7097e1aeda8b7dd6af19a6c0ab8 (patch) | |
| tree | c660451dde236cb20dfa17474505584268a2aa01 | |
| parent | 7696bec538a6cab3b17133bc21d2e6411397c571 (diff) | |
| parent | 6a471755231eb6481c7ce2091b58755b10373acc (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
| -rw-r--r-- | sql/updates/world/2014_10_01_01_world.sql | 1 | ||||
| -rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sql/updates/world/2014_10_01_01_world.sql b/sql/updates/world/2014_10_01_01_world.sql new file mode 100644 index 00000000000..c36cedfe9d8 --- /dev/null +++ b/sql/updates/world/2014_10_01_01_world.sql @@ -0,0 +1 @@ +UPDATE `quest_template` SET `SpecialFlags`=0 WHERE `Id` = 11293; diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 4c00b3d8781..79512e57fe3 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -541,9 +541,15 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player int loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); int locdbc_idx = player->GetSession()->GetSessionDbcLocale(); + time_t curTime = sWorld->GetGameTime(); + for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) { AuctionEntry* Aentry = itr->second; + // Skip expired auctions + if (Aentry->expire_time < curTime) + continue; + Item* item = sAuctionMgr->GetAItem(Aentry->itemGUIDLow); if (!item) continue; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 90a7945beca..d5ddf62b441 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3329,6 +3329,7 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->AttributesEx3 |= SPELL_ATTR3_STACK_FOR_DIFF_CASTERS; break; case 51798: // Brewfest - Relay Race - Intro - Quest Complete + case 47134: // Quest Complete //! HACK: This spell break quest complete for alliance and on retail not used °_O spellInfo->Effects[EFFECT_0].Effect = 0; break; |