From fb6e635c8094a03348ddfaee4cc9d17638079a38 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Wed, 1 Oct 2014 21:34:07 +0200 Subject: Core/AH: Don't send expired auctions to clients Fixes #12964 --- src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 3c27453fa7e..8955fc9014f 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -538,9 +538,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; -- cgit v1.2.3 From 6a471755231eb6481c7ce2091b58755b10373acc Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Thu, 2 Oct 2014 05:49:07 +0200 Subject: Core/Spells: Added hack for "Bark for the Barleybrews!" quest credit (for alliance-side) (meh, blizzard :/) --- sql/updates/world/2014_10_01_01_world.sql | 1 + src/server/game/Spells/SpellMgr.cpp | 1 + 2 files changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_10_01_01_world.sql (limited to 'src') 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/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 33e711bb10f..55d955428b1 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3319,6 +3319,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; -- cgit v1.2.3