Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

src/server/game/Handlers/AuctionHouseHandler.cpp

@@ -123,6 +123,12 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
     uint64 itemGUIDs[MAX_AUCTION_ITEMS]; // 160 slot = 4x 36 slot bag + backpack 16 slot
     uint32 count[MAX_AUCTION_ITEMS];
 
+    if (itemsCount > MAX_AUCTION_ITEMS)
+    {
+        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
+        return;
+    }
+    
     for (uint32 i = 0; i < itemsCount; ++i)
     {
         recv_data >> itemGUIDs[i];
@@ -153,12 +159,6 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
         return;
     }
 
-    if (itemsCount > MAX_AUCTION_ITEMS)
-    {
-        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
-        return;
-    }
-
     etime *= MINUTE;
 
     switch(etime)

src/server/game/Spells/Auras/SpellAuraEffects.cpp

@@ -374,7 +374,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
 
 AuraEffect::AuraEffect(Aura* base, uint8 effIndex, int32 *baseAmount, Unit* caster):
 m_base(base), m_spellInfo(base->GetSpellInfo()),
-m_baseAmount(baseAmount ? *baseAmount : m_spellInfo->Effects[m_effIndex].BasePoints),
+m_baseAmount(baseAmount ? *baseAmount : m_spellInfo->Effects[effIndex].BasePoints),
 m_spellmod(NULL), m_periodicTimer(0), m_tickNumber(0), m_effIndex(effIndex),
 m_canBeRecalculated(true), m_isPeriodic(false)
 {

src/server/game/Spells/SpellEffects.cpp

@@ -3064,6 +3064,9 @@ void Spell::EffectSummonType(SpellEffIndex effIndex)
         case 629:
         case 181:
         case 715:
+        case 1562:
+        case 833:
+        case 1161:
             numSummons = (damage > 0) ? damage : 1;
             break;
         default: