Core: Updated to 11.1.0

3 files changed, 10 insertions, 2 deletions

diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
index 62dbabe2a05..515325e3674 100644
--- a/src/server/game/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp
@@ -1006,6 +1006,7 @@ void WorldSession::SendAuctionHello(ObjectGuid guid, Unit const* unit)
 
     WorldPackets::AuctionHouse::AuctionHelloResponse auctionHelloResponse;
     auctionHelloResponse.Auctioneer = guid;
+    auctionHelloResponse.AuctionHouseID = ahEntry->ID;
     auctionHelloResponse.OpenForBusiness = true;                         // 3.3.3: 1 - AH enabled, 0 - AH disabled
     SendPacket(auctionHelloResponse.Write());
 }
diff --git a/src/server/game/Handlers/CollectionsHandler.cpp b/src/server/game/Handlers/CollectionsHandler.cpp
index f3f3703c3b7..0302ad4b354 100644
--- a/src/server/game/Handlers/CollectionsHandler.cpp
+++ b/src/server/game/Handlers/CollectionsHandler.cpp
@@ -36,6 +36,7 @@ void WorldSession::HandleCollectionItemSetFavorite(WorldPackets::Collections::Co
             break;
         }
         case ItemCollectionType::TransmogSetFavorite:
+        case ItemCollectionType::WarbandScene:
             break;
         default:
             break;
diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
index b8a0b8aa7ac..f1cebdf0746 100644
--- a/src/server/game/Handlers/NPCHandler.cpp
+++ b/src/server/game/Handlers/NPCHandler.cpp
@@ -372,9 +372,15 @@ void WorldSession::SendPetStableResult(StableResult result)
 
 void WorldSession::HandleSetPetSlot(WorldPackets::NPC::SetPetSlot& setPetSlot)
 {
-    if (!CheckStableMaster(setPetSlot.StableMaster) || setPetSlot.DestSlot >= PET_SAVE_LAST_STABLE_SLOT)
+    if (!CheckStableMaster(setPetSlot.StableMaster))
     {
-        SendPetStableResult(StableResult::InternalError);
+        SendPetStableResult(StableResult::NotStableMaster);
+        return;
+    }
+
+    if (setPetSlot.DestSlot >= PET_SAVE_LAST_STABLE_SLOT)
+    {
+        SendPetStableResult(StableResult::InvalidSlot);
         return;
     }