Core/DataStores: Updated dbc/db2 structures to 6.2.0

2 files changed, 9 insertions, 0 deletions

diff --git a/src/server/game/Garrison/Garrison.h b/src/server/game/Garrison/Garrison.h
index 7123854cbc6..11311ef7fc3 100644
--- a/src/server/game/Garrison/Garrison.h
+++ b/src/server/game/Garrison/Garrison.h
@@ -37,6 +37,12 @@ enum GarrisonFollowerFlags
     GARRISON_FOLLOWER_FLAG_UNIQUE   = 0x1
 };
 
+enum GarrisonFollowerType
+{
+    FOLLOWER_TYPE_GARRISON = 1,
+    FOLLOWER_TYPE_SHIPYARD = 2
+};
+
 enum GarrisonAbilityFlags
 {
     GARRISON_ABILITY_FLAG_TRAIT         = 0x01,
diff --git a/src/server/game/Garrison/GarrisonMgr.cpp b/src/server/game/Garrison/GarrisonMgr.cpp
index 349ebdc42a1..86392a26d36 100644
--- a/src/server/game/Garrison/GarrisonMgr.cpp
+++ b/src/server/game/Garrison/GarrisonMgr.cpp
@@ -46,6 +46,9 @@ void GarrisonMgr::Initialize()
     {
         if (GarrAbilityEntry const* ability = sGarrAbilityStore.LookupEntry(followerAbility->GarrAbilityID))
         {
+            if (ability->FollowerTypeID != FOLLOWER_TYPE_GARRISON)
+                continue;
+
             if (!(ability->Flags & GARRISON_ABILITY_CANNOT_ROLL) && ability->Flags & GARRISON_ABILITY_FLAG_TRAIT)
                 _garrisonFollowerRandomTraits.insert(ability);