Core/Players: Use ChrRaces::Alliance instead of ChrRaces::BaseLanguage to determine faction

chemicstry · Shauren · commit 59f8884882b0 · 2026-03-09T19:35:26.000+01:00
(cherry picked from commit 7c72f27)
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -6282,10 +6282,10 @@ uint32 Player::TeamForRace(uint8 race)
 {
     if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(race))
     {
-        switch (rEntry->BaseLanguage)
+        switch (rEntry->Alliance)
         {
+            case 0: return ALLIANCE;
             case 1: return HORDE;
-            case 7: return ALLIANCE;
         }
         TC_LOG_ERROR("entities.player", "Race ({}) has wrong teamid ({}) in DBC: wrong DBC files?", uint32(race), rEntry->BaseLanguage);
     }

Original file line number	Diff line number	Diff line change
`@@ -6282,10 +6282,10 @@ uint32 Player::TeamForRace(uint8 race)`
`6282`	`6282`	`{`
`6283`	`6283`	`if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(race))`
`6284`	`6284`	`{`
`6285`		`- switch (rEntry->BaseLanguage)`
	`6285`	`+ switch (rEntry->Alliance)`
`6286`	`6286`	`{`
	`6287`	`+ case 0: return ALLIANCE;`
`6287`	`6288`	`case 1: return HORDE;`
`6288`		`- case 7: return ALLIANCE;`
`6289`	`6289`	`}`
`6290`	`6290`	`TC_LOG_ERROR("entities.player", "Race ({}) has wrong teamid ({}) in DBC: wrong DBC files?", uint32(race), rEntry->BaseLanguage);`
`6291`	`6291`	`}`