*GO - Southfury Moonstone script, from SD2, patch by manuel

*Fix Auctionhouse CPU usage during item expire check, by MrSmite

--HG--
branch : trunk

2 files changed, 21 insertions, 3 deletions

diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index 85bc815efd1..2edaa3f374c 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -537,8 +537,16 @@ void AuctionHouseObject::Update()
 {
     time_t curTime = sWorld.GetGameTime();
     ///- Handle expired auctions
-    AuctionEntryMap::iterator next;
-    for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end();itr = next)
+
+    // reset next if at end of map
+    if (next == AuctionsMap.end())
+        next = AuctionsMap.begin();
+
+    uint32 loopBreaker = 0;
+
+    // Initialize itr with next. next is stored for future calls to Update() after
+    // 50 items are checked
+    for (AuctionEntryMap::const_iterator itr = next; itr != AuctionsMap.end(); itr = next)
     {
         next = itr;
         ++next;
@@ -565,6 +573,12 @@ void AuctionHouseObject::Update()
             delete itr->second;
             RemoveAuction(itr->first);
         }
+
+        // only check 50 items per update to not peg the CPU
+        ++loopBreaker;
+
+        if (loopBreaker > 50)
+            break;
     }
 }
 
diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h
index 2a106cf20f9..32635af43e8 100644
--- a/src/game/AuctionHouseMgr.h
+++ b/src/game/AuctionHouseMgr.h
@@ -76,7 +76,8 @@ struct AuctionEntry
 class AuctionHouseObject
 {
   public:
-    AuctionHouseObject() {}
+    // Initialize storage
+    AuctionHouseObject() { next = AuctionsMap.begin(); }
     ~AuctionHouseObject()
     {
         for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
@@ -118,6 +119,9 @@ class AuctionHouseObject
 
   private:
     AuctionEntryMap AuctionsMap;
+
+    // storage for "next" auction item for next Update()
+    AuctionEntryMap::const_iterator next;
 };
 
 class AuctionHouseMgr