Core/Misc: downgraded RaceMask code for Cataclysm

* updated RaceMask defines in preparation for 4.4.1

7 files changed, 61 insertions, 204 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 7b58e973243..e3ece3f53d9 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -18806,9 +18806,6 @@ bool Player::_LoadHomeBind(PreparedQueryResult result)
     if (!ok)
     {
         WorldSafeLocsEntry const* loc = sObjectMgr->GetDefaultGraveyard(GetTeam());
-        if (!loc && GetRace() == RACE_PANDAREN_NEUTRAL)
-            loc = sObjectMgr->GetWorldSafeLoc(3295); // The Wandering Isle, Starting Area GY
-
         ASSERT(loc, "Missing fallback graveyard location for faction %u", uint32(GetTeamId()));
 
         m_homebind.WorldRelocate(loc->Loc);
diff --git a/src/server/game/Entities/Player/PlayerTaxi.cpp b/src/server/game/Entities/Player/PlayerTaxi.cpp
index e8cbe9d620d..70bc584baff 100644
--- a/src/server/game/Entities/Player/PlayerTaxi.cpp
+++ b/src/server/game/Entities/Player/PlayerTaxi.cpp
@@ -46,7 +46,6 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level
         case RACE_GNOME:
         case RACE_DRAENEI:
         case RACE_WORGEN:
-        case RACE_PANDAREN_ALLIANCE:
             SetTaximaskNode(2);     // Stormwind, Elwynn
             SetTaximaskNode(6);     // Ironforge, Dun Morogh
             SetTaximaskNode(26);    // Lor'danel, Darkshore
@@ -67,7 +66,6 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level
         case RACE_TROLL:
         case RACE_BLOODELF:
         case RACE_GOBLIN:
-        case RACE_PANDAREN_HORDE:
             SetTaximaskNode(11);    // Undercity, Tirisfal
             SetTaximaskNode(22);    // Thunder Bluff, Mulgore
             SetTaximaskNode(23);    // Orgrimmar, Durotar
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index e47df9e3100..3a55a5ae777 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -4061,9 +4061,6 @@ void ObjectMgr::LoadPlayerInfo()
                 if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_CATACLYSM && (race == RACE_GOBLIN || race == RACE_WORGEN))
                     continue;
 
-                if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_MISTS_OF_PANDARIA && (race == RACE_PANDAREN_NEUTRAL || race == RACE_PANDAREN_HORDE || race == RACE_PANDAREN_ALLIANCE))
-                    continue;
-
                 if (sWorld->getIntConfig(CONFIG_EXPANSION) < EXPANSION_LEGION && class_ == CLASS_DEMON_HUNTER)
                     continue;
 
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 0fc73303944..df923e97445 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -2140,7 +2140,7 @@ void WorldSession::HandleCharRaceOrFactionChangeCallback(std::shared_ptr<WorldPa
         trans->Append(stmt);
 
         // Race specific languages
-        std::array<uint8, 4> const racesWithoutSpecificLanguages = { RACE_ORC, RACE_HUMAN, RACE_MAGHAR_ORC, RACE_KUL_TIRAN };
+        std::array<uint8, 4> const racesWithoutSpecificLanguages = { RACE_ORC, RACE_HUMAN };
         if (std::find(racesWithoutSpecificLanguages.begin(), racesWithoutSpecificLanguages.end(), factionChangeInfo->RaceID) == racesWithoutSpecificLanguages.end())
         {
             stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHAR_SKILL_LANGUAGE);
@@ -2149,15 +2149,12 @@ void WorldSession::HandleCharRaceOrFactionChangeCallback(std::shared_ptr<WorldPa
             switch (factionChangeInfo->RaceID)
             {
                 case RACE_DWARF:
-                case RACE_DARK_IRON_DWARF:
                     stmt->setUInt16(1, 111);
                     break;
                 case RACE_DRAENEI:
-                case RACE_LIGHTFORGED_DRAENEI:
                     stmt->setUInt16(1, 759);
                     break;
                 case RACE_GNOME:
-                case RACE_MECHAGNOME:
                     stmt->setUInt16(1, 313);
                     break;
                 case RACE_NIGHTELF:
@@ -2170,34 +2167,17 @@ void WorldSession::HandleCharRaceOrFactionChangeCallback(std::shared_ptr<WorldPa
                     stmt->setUInt16(1, 673);
                     break;
                 case RACE_TAUREN:
-                case RACE_HIGHMOUNTAIN_TAUREN:
                     stmt->setUInt16(1, 115);
                     break;
                 case RACE_TROLL:
-                case RACE_ZANDALARI_TROLL:
                     stmt->setUInt16(1, 315);
                     break;
                 case RACE_BLOODELF:
-                case RACE_VOID_ELF:
                     stmt->setUInt16(1, 137);
                     break;
                 case RACE_GOBLIN:
                     stmt->setUInt16(1, 792);
                     break;
-                case RACE_NIGHTBORNE:
-                    stmt->setUInt16(1, 2464);
-                    break;
-                case RACE_VULPERA:
-                    stmt->setUInt16(1, 2776);
-                    break;
-                case LANG_PANDAREN_ALLIANCE:
-                case LANG_PANDAREN_HORDE:
-                    stmt->setUInt16(1, 905);
-                    break;
-                case RACE_DRACTHYR_ALLIANCE:
-                case RACE_DRACTHYR_HORDE:
-                    stmt->setUInt16(1, 138);
-                    break;
                 default:
                     TC_LOG_ERROR("entities.player", "Could not find language data for race ({}).", factionChangeInfo->RaceID);
                     SendCharFactionChange(CHAR_CREATE_ERROR, factionChangeInfo.get());
diff --git a/src/server/game/Miscellaneous/RaceMask.h b/src/server/game/Miscellaneous/RaceMask.h
index 2c1e1a29932..dfc73ef159e 100644
--- a/src/server/game/Miscellaneous/RaceMask.h
+++ b/src/server/game/Miscellaneous/RaceMask.h
@@ -24,57 +24,64 @@
 // EnumUtils: DESCRIBE THIS
 enum Races
 {
-    RACE_NONE                   = 0,  // SKIP
-    RACE_HUMAN                  = 1,  // TITLE Human
-    RACE_ORC                    = 2,  // TITLE Orc
-    RACE_DWARF                  = 3,  // TITLE Dwarf
-    RACE_NIGHTELF               = 4,  // TITLE Night Elf
-    RACE_UNDEAD_PLAYER          = 5,  // TITLE Undead
-    RACE_TAUREN                 = 6,  // TITLE Tauren
-    RACE_GNOME                  = 7,  // TITLE Gnome
-    RACE_TROLL                  = 8,  // TITLE Troll
-    RACE_GOBLIN                 = 9,  // TITLE Goblin
-    RACE_BLOODELF               = 10, // TITLE Blood Elf
-    RACE_DRAENEI                = 11, // TITLE Draenei
-    //RACE_FEL_ORC              = 12,
-    //RACE_NAGA                 = 13,
-    //RACE_BROKEN               = 14,
-    //RACE_SKELETON             = 15,
-    //RACE_VRYKUL               = 16,
-    //RACE_TUSKARR              = 17,
-    //RACE_FOREST_TROLL         = 18,
-    //RACE_TAUNKA               = 19,
-    //RACE_NORTHREND_SKELETON   = 20,
-    //RACE_ICE_TROLL            = 21,
-    RACE_WORGEN                 = 22, // TITLE Worgen
-    //RACE_GILNEAN              = 23,
-    RACE_PANDAREN_NEUTRAL       = 24, // TITLE Pandaren DESCRIPTION Pandaren (Neutral)
-    RACE_PANDAREN_ALLIANCE      = 25, // TITLE Pandaren DESCRIPTION Pandaren (Alliance)
-    RACE_PANDAREN_HORDE         = 26, // TITLE Pandaren DESCRIPTION Pandaren (Horde)
-    RACE_NIGHTBORNE             = 27, // TITLE Nightborne
-    RACE_HIGHMOUNTAIN_TAUREN    = 28, // TITLE Highmountain Tauren
-    RACE_VOID_ELF               = 29, // TITLE Void Elf
-    RACE_LIGHTFORGED_DRAENEI    = 30, // TITLE Lightforged Draenei
-    RACE_ZANDALARI_TROLL        = 31, // TITLE Zandalari Troll
-    RACE_KUL_TIRAN              = 32, // TITLE Kul Tiran
-    //RACE_THIN_HUMAN           = 33,
-    RACE_DARK_IRON_DWARF        = 34, // TITLE Dark Iron Dwarf DESCRIPTION Dark Iron Dwarf (RaceMask bit 11)
-    RACE_VULPERA                = 35, // TITLE Vulpera DESCRIPTION Vulpera (RaceMask bit 12)
-    RACE_MAGHAR_ORC             = 36, // TITLE Mag'har Orc DESCRIPTION Mag'har Orc (RaceMask bit 13)
-    RACE_MECHAGNOME             = 37, // TITLE Mechagnome DESCRIPTION Mechagnome (RaceMask bit 14)
-    RACE_DRACTHYR_ALLIANCE      = 52, // TITLE Dracthyr DESCRIPTION Dracthyr (Alliance) (RaceMask bit 16)
-    RACE_DRACTHYR_HORDE         = 70, // TITLE Dracthyr DESCRIPTION Dracthyr (Horde) (RaceMask bit 15)
-    //RACE_COMPANION_DRAKE      = 71,
-    //RACE_COMPANION_PROTO_DRAGON = 72,
-    //RACE_COMPANION_SERPENT    = 73,
-    //RACE_COMPANION_WYVERN     = 74,
-    //RACE_DRACTHYR_VISAGE_ALLIANCE = 75,
-    //RACE_DRACTHYR_VISAGE_HORDE= 76,
-    //RACE_COMPANION_PTERRODAX  = 77
+    RACE_NONE                       = 0,  // SKIP
+    RACE_HUMAN                      = 1,  // TITLE Human
+    RACE_ORC                        = 2,  // TITLE Orc
+    RACE_DWARF                      = 3,  // TITLE Dwarf
+    RACE_NIGHTELF                   = 4,  // TITLE Night Elf
+    RACE_UNDEAD_PLAYER              = 5,  // TITLE Undead
+    RACE_TAUREN                     = 6,  // TITLE Tauren
+    RACE_GNOME                      = 7,  // TITLE Gnome
+    RACE_TROLL                      = 8,  // TITLE Troll
+    RACE_GOBLIN                     = 9,  // TITLE Goblin
+    RACE_BLOODELF                   = 10, // TITLE Blood Elf
+    RACE_DRAENEI                    = 11, // TITLE Draenei
+    //RACE_FEL_ORC                  = 12,
+    //RACE_NAGA                     = 13,
+    //RACE_BROKEN                   = 14,
+    //RACE_SKELETON                 = 15,
+    //RACE_VRYKUL                   = 16,
+    //RACE_TUSKARR                  = 17,
+    //RACE_FOREST_TROLL             = 18,
+    //RACE_TAUNKA                   = 19,
+    //RACE_NORTHREND_SKELETON       = 20,
+    //RACE_ICE_TROLL                = 21,
+    RACE_WORGEN                     = 22, // TITLE Worgen
+    //RACE_GILNEAN                  = 23,
+    //RACE_PANDAREN_NEUTRAL           = 24, // TITLE Pandaren DESCRIPTION Pandaren (Neutral)
+    //RACE_PANDAREN_ALLIANCE          = 25, // TITLE Pandaren DESCRIPTION Pandaren (Alliance)
+    //RACE_PANDAREN_HORDE             = 26, // TITLE Pandaren DESCRIPTION Pandaren (Horde)
+    //RACE_NIGHTBORNE                 = 27, // TITLE Nightborne
+    //RACE_HIGHMOUNTAIN_TAUREN        = 28, // TITLE Highmountain Tauren
+    //RACE_VOID_ELF                   = 29, // TITLE Void Elf
+    //RACE_LIGHTFORGED_DRAENEI        = 30, // TITLE Lightforged Draenei
+    //RACE_ZANDALARI_TROLL            = 31, // TITLE Zandalari Troll
+    //RACE_KUL_TIRAN                  = 32, // TITLE Kul Tiran
+    //RACE_THIN_HUMAN                 = 33,
+    //RACE_DARK_IRON_DWARF            = 34, // TITLE Dark Iron Dwarf DESCRIPTION Dark Iron Dwarf (RaceMask bit 11)
+    //RACE_VULPERA                    = 35, // TITLE Vulpera DESCRIPTION Vulpera (RaceMask bit 12)
+    //RACE_MAGHAR_ORC                 = 36, // TITLE Mag'har Orc DESCRIPTION Mag'har Orc (RaceMask bit 13)
+    //RACE_MECHAGNOME                 = 37, // TITLE Mechagnome DESCRIPTION Mechagnome (RaceMask bit 14)
+    //RACE_DRACTHYR_ALLIANCE          = 52, // TITLE Dracthyr DESCRIPTION Dracthyr (Alliance) (RaceMask bit 16)
+    //RACE_DRACTHYR_HORDE             = 70, // TITLE Dracthyr DESCRIPTION Dracthyr (Horde) (RaceMask bit 15)
+    //RACE_COMPANION_DRAKE            = 71,
+    //RACE_COMPANION_PROTO_DRAGON     = 72,
+    //RACE_COMPANION_SERPENT          = 73,
+    //RACE_COMPANION_WYVERN           = 74,
+    //RACE_DRACTHYR_VISAGE_ALLIANCE   = 75,
+    //RACE_DRACTHYR_VISAGE_HORDE      = 76,
+    //RACE_COMPANION_PTERRODAX        = 77,
+    //RACE_COMPANION_NETHERWING_DRAKE = 80,
+    //RACE_ROSTRUM_STORM_GRYPHON      = 82,
+    //RACE_ROSTRUM_FAERIE_DRAGON      = 83,
+    //RACE_EARTHEN_DWARF_HORDE        = 84, // TITLE Earthen DESCRIPTION Earthen (Horde) (RaceMask bit 17)
+    //RACE_EARTHEN_DWARF_ALLIANCE     = 85, // TITLE Earthen DESCRIPTION Earthen (Alliance) (RaceMask bit 18)
+    //RACE_HARRONIR                   = 86,
+    //RACE_ROSTRUM_AIRSHIP            = 87,
 };
 
 // max+1 for player race
-#define MAX_RACES         78
+#define MAX_RACES                       22
 
 namespace Trinity
 {
@@ -106,28 +113,7 @@ struct RaceMask
             case RACE_BLOODELF:
             case RACE_DRAENEI:
             case RACE_WORGEN:
-            case RACE_PANDAREN_NEUTRAL:
-            case RACE_PANDAREN_ALLIANCE:
-            case RACE_PANDAREN_HORDE:
-            case RACE_NIGHTBORNE:
-            case RACE_HIGHMOUNTAIN_TAUREN:
-            case RACE_VOID_ELF:
-            case RACE_LIGHTFORGED_DRAENEI:
-            case RACE_ZANDALARI_TROLL:
-            case RACE_KUL_TIRAN:
                 return raceId - 1;
-            case RACE_DARK_IRON_DWARF:
-                return 11;
-            case RACE_VULPERA:
-                return 12;
-            case RACE_MAGHAR_ORC:
-                return 13;
-            case RACE_MECHAGNOME:
-                return 14;
-            case RACE_DRACTHYR_ALLIANCE:
-                return 16;
-            case RACE_DRACTHYR_HORDE:
-                return 15;
             default:
                 break;
         }
@@ -161,24 +147,7 @@ constexpr Trinity::RaceMask<uint64> RACEMASK_ALL_PLAYABLE = { std::integral_cons
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_BLOODELF)            |
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DRAENEI)             |
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_GOBLIN)              |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_WORGEN)              |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_PANDAREN_NEUTRAL)    |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_PANDAREN_ALLIANCE)   |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_PANDAREN_HORDE)      |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_NIGHTBORNE)          |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_HIGHMOUNTAIN_TAUREN) |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_VOID_ELF)            |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_LIGHTFORGED_DRAENEI) |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_ZANDALARI_TROLL)     |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_KUL_TIRAN)           |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DARK_IRON_DWARF)     |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_VULPERA)             |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_MAGHAR_ORC)          |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_MECHAGNOME)          |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DRACTHYR_ALLIANCE)   |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DRACTHYR_HORDE)>::value };
-
-constexpr Trinity::RaceMask<uint64> RACEMASK_NEUTRAL = { std::integral_constant<uint64, Trinity::RaceMask<uint64>::GetMaskForRace(RACE_PANDAREN_NEUTRAL)>::value };
+     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_WORGEN)>::value };
 
 constexpr Trinity::RaceMask<uint64> RACEMASK_ALLIANCE = { std::integral_constant<uint64,
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_HUMAN)               |
@@ -186,15 +155,8 @@ constexpr Trinity::RaceMask<uint64> RACEMASK_ALLIANCE = { std::integral_constant
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_NIGHTELF)            |
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_GNOME)               |
      Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DRAENEI)             |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_WORGEN)              |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_PANDAREN_ALLIANCE)   |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_VOID_ELF)            |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_LIGHTFORGED_DRAENEI) |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_KUL_TIRAN)           |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DARK_IRON_DWARF)     |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_MECHAGNOME)          |
-     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_DRACTHYR_ALLIANCE)>::value };
+     Trinity::RaceMask<uint64>::GetMaskForRace(RACE_WORGEN)>::value };
 
-constexpr Trinity::RaceMask<uint64> RACEMASK_HORDE = { std::integral_constant<uint64, (RACEMASK_ALL_PLAYABLE & ~(RACEMASK_NEUTRAL | RACEMASK_ALLIANCE)).RawValue>::value };
+constexpr Trinity::RaceMask<uint64> RACEMASK_HORDE = { std::integral_constant<uint64, (RACEMASK_ALL_PLAYABLE & ~RACEMASK_ALLIANCE).RawValue>::value };
 
 #endif // RaceMask_h__
diff --git a/src/server/game/Miscellaneous/enuminfo_RaceMask.cpp b/src/server/game/Miscellaneous/enuminfo_RaceMask.cpp
index 3225a607dbe..ccb1bf88880 100644
--- a/src/server/game/Miscellaneous/enuminfo_RaceMask.cpp
+++ b/src/server/game/Miscellaneous/enuminfo_RaceMask.cpp
@@ -43,23 +43,6 @@ TC_API_EXPORT EnumText EnumUtils<Races>::ToString(Races value)
         case RACE_BLOODELF: return { "RACE_BLOODELF", "Blood Elf", "" };
         case RACE_DRAENEI: return { "RACE_DRAENEI", "Draenei", "" };
         case RACE_WORGEN: return { "RACE_WORGEN", "Worgen", "" };
-        case RACE_PANDAREN_NEUTRAL: return { "RACE_PANDAREN_NEUTRAL", "Pandaren", "Pandaren (Neutral)" };
-        case RACE_PANDAREN_ALLIANCE: return { "RACE_PANDAREN_ALLIANCE", "Pandaren", "Pandaren (Alliance)" };
-        case RACE_PANDAREN_HORDE: return { "RACE_PANDAREN_HORDE", "Pandaren", "Pandaren (Horde)" };
-        case RACE_NIGHTBORNE: return { "RACE_NIGHTBORNE", "Nightborne", "" };
-        case RACE_HIGHMOUNTAIN_TAUREN: return { "RACE_HIGHMOUNTAIN_TAUREN", "Highmountain Tauren", "" };
-        case RACE_VOID_ELF: return { "RACE_VOID_ELF", "Void Elf", "" };
-        case RACE_LIGHTFORGED_DRAENEI: return { "RACE_LIGHTFORGED_DRAENEI", "Lightforged Draenei", "" };
-        case RACE_ZANDALARI_TROLL: return { "RACE_ZANDALARI_TROLL", "Zandalari Troll", "" };
-        case RACE_KUL_TIRAN: return { "RACE_KUL_TIRAN", "Kul Tiran", "" };
-        case RACE_DARK_IRON_DWARF: return { "RACE_DARK_IRON_DWARF", "Dark Iron Dwarf", "Dark Iron Dwarf (RaceMask bit 11)" };
-        case RACE_VULPERA: return { "RACE_VULPERA", "Vulpera", "Vulpera (RaceMask bit 12)" };
-        case RACE_MAGHAR_ORC: return { "RACE_MAGHAR_ORC", "Mag'har Orc", "Mag'har Orc (RaceMask bit 13)" };
-        case RACE_MECHAGNOME: return { "RACE_MECHAGNOME", "Mechagnome", "Mechagnome (RaceMask bit 14)" };
-        case RACE_DRACTHYR_ALLIANCE: return { "RACE_DRACTHYR_ALLIANCE", "Dracthyr", "Dracthyr (Alliance) (RaceMask bit 16)" };
-        case RACE_DRACTHYR_HORDE: return { "RACE_DRACTHYR_HORDE", "Dracthyr", "Dracthyr (Horde) (RaceMask bit 15)" };
-        case RACE_EARTHEN_DWARF_HORDE: return { "RACE_EARTHEN_DWARF_HORDE", "Earthen", "Earthen (Horde) (RaceMask bit 17)" };
-        case RACE_EARTHEN_DWARF_ALLIANCE: return { "RACE_EARTHEN_DWARF_ALLIANCE", "Earthen", "Earthen (Alliance) (RaceMask bit 18)" };
         default: throw std::out_of_range("value");
     }
 }
@@ -84,23 +67,6 @@ TC_API_EXPORT Races EnumUtils<Races>::FromIndex(size_t index)
         case 9: return RACE_BLOODELF;
         case 10: return RACE_DRAENEI;
         case 11: return RACE_WORGEN;
-        case 12: return RACE_PANDAREN_NEUTRAL;
-        case 13: return RACE_PANDAREN_ALLIANCE;
-        case 14: return RACE_PANDAREN_HORDE;
-        case 15: return RACE_NIGHTBORNE;
-        case 16: return RACE_HIGHMOUNTAIN_TAUREN;
-        case 17: return RACE_VOID_ELF;
-        case 18: return RACE_LIGHTFORGED_DRAENEI;
-        case 19: return RACE_ZANDALARI_TROLL;
-        case 20: return RACE_KUL_TIRAN;
-        case 21: return RACE_DARK_IRON_DWARF;
-        case 22: return RACE_VULPERA;
-        case 23: return RACE_MAGHAR_ORC;
-        case 24: return RACE_MECHAGNOME;
-        case 25: return RACE_DRACTHYR_ALLIANCE;
-        case 26: return RACE_DRACTHYR_HORDE;
-        case 27: return RACE_EARTHEN_DWARF_HORDE;
-        case 28: return RACE_EARTHEN_DWARF_ALLIANCE;
         default: throw std::out_of_range("index");
     }
 }
@@ -122,23 +88,6 @@ TC_API_EXPORT size_t EnumUtils<Races>::ToIndex(Races value)
         case RACE_BLOODELF: return 9;
         case RACE_DRAENEI: return 10;
         case RACE_WORGEN: return 11;
-        case RACE_PANDAREN_NEUTRAL: return 12;
-        case RACE_PANDAREN_ALLIANCE: return 13;
-        case RACE_PANDAREN_HORDE: return 14;
-        case RACE_NIGHTBORNE: return 15;
-        case RACE_HIGHMOUNTAIN_TAUREN: return 16;
-        case RACE_VOID_ELF: return 17;
-        case RACE_LIGHTFORGED_DRAENEI: return 18;
-        case RACE_ZANDALARI_TROLL: return 19;
-        case RACE_KUL_TIRAN: return 20;
-        case RACE_DARK_IRON_DWARF: return 21;
-        case RACE_VULPERA: return 22;
-        case RACE_MAGHAR_ORC: return 23;
-        case RACE_MECHAGNOME: return 24;
-        case RACE_DRACTHYR_ALLIANCE: return 25;
-        case RACE_DRACTHYR_HORDE: return 26;
-        case RACE_EARTHEN_DWARF_HORDE: return 27;
-        case RACE_EARTHEN_DWARF_ALLIANCE: return 28;
         default: throw std::out_of_range("value");
     }
 }
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index d49718cb190..1a2fffd6414 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -423,20 +423,7 @@ class spell_gen_battleground_mercenary_shapeshift : public AuraScript
         { RACE_GOBLIN, { RACE_GNOME, RACE_DWARF } },
         { RACE_BLOODELF, { RACE_HUMAN, RACE_NIGHTELF } },
         { RACE_DRAENEI, { RACE_TAUREN, RACE_ORC } },
-        { RACE_WORGEN, { RACE_TROLL } },
-        { RACE_PANDAREN_NEUTRAL, { RACE_PANDAREN_NEUTRAL } },
-        { RACE_PANDAREN_ALLIANCE, { RACE_PANDAREN_HORDE, RACE_PANDAREN_NEUTRAL } },
-        { RACE_PANDAREN_HORDE, { RACE_PANDAREN_ALLIANCE, RACE_PANDAREN_NEUTRAL } },
-        { RACE_NIGHTBORNE, { RACE_NIGHTELF, RACE_HUMAN } },
-        { RACE_HIGHMOUNTAIN_TAUREN, { RACE_DRAENEI, RACE_NIGHTELF } },
-        { RACE_VOID_ELF, { RACE_TROLL, RACE_BLOODELF } },
-        { RACE_LIGHTFORGED_DRAENEI, { RACE_TAUREN, RACE_ORC } },
-        { RACE_ZANDALARI_TROLL, { RACE_KUL_TIRAN, RACE_HUMAN } },
-        { RACE_KUL_TIRAN, { RACE_ZANDALARI_TROLL } },
-        { RACE_DARK_IRON_DWARF, { RACE_MAGHAR_ORC, RACE_ORC } },
-        { RACE_VULPERA, { RACE_MECHAGNOME, RACE_DARK_IRON_DWARF /*guessed, for shamans*/ } },
-        { RACE_MAGHAR_ORC, { RACE_DARK_IRON_DWARF } },
-        { RACE_MECHAGNOME, { RACE_VULPERA } },
+        { RACE_WORGEN, { RACE_TROLL } }
     };
 
     inline static std::unordered_map<Races, std::array<uint32, 2>> const RaceDisplayIds =
@@ -452,20 +439,7 @@ class spell_gen_battleground_mercenary_shapeshift : public AuraScript
         { RACE_GOBLIN, { 55267, 57244 } },
         { RACE_BLOODELF, { 55265, 55264 } },
         { RACE_DRAENEI, { 55247, 55246 } },
-        { RACE_WORGEN, { 55255, 55254 } },
-        { RACE_PANDAREN_NEUTRAL, { 55253, 55252 } }, // not verified, might be swapped with RACE_PANDAREN_HORDE
-        { RACE_PANDAREN_ALLIANCE, { 55249, 55248 } },
-        { RACE_PANDAREN_HORDE, { 55251, 55250 } },
-        { RACE_NIGHTBORNE, { 82375, 82376 } },
-        { RACE_HIGHMOUNTAIN_TAUREN, { 82377, 82378 } },
-        { RACE_VOID_ELF, { 82371, 82372 } },
-        { RACE_LIGHTFORGED_DRAENEI, { 82373, 82374 } },
-        { RACE_ZANDALARI_TROLL, { 88417, 88416 } },
-        { RACE_KUL_TIRAN, { 88414, 88413 } },
-        { RACE_DARK_IRON_DWARF, { 88409, 88408 } },
-        { RACE_VULPERA, { 94999, 95001 } },
-        { RACE_MAGHAR_ORC, { 88420, 88410 } },
-        { RACE_MECHAGNOME, { 94998, 95000 } },
+        { RACE_WORGEN, { 55255, 55254 } }
     };
 
     inline static std::vector<uint32> RacialSkills;