aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoraquadeus <efectokoleos13@gmail.com>2024-03-23 19:20:03 +0100
committerfunjoker <funjoker109@gmail.com>2024-03-28 20:22:55 +0100
commit98cb0b4eaf7b66ae797dfb3c92c586adbc3ced6c (patch)
treef15a9d238921cda0aa8bfb6338a92f73d95023ce /src
parent7a6d78c90a9e3699f01fecb4d3d7edd6d9769a85 (diff)
Core/Players: Fix console errors of wrong teamid for neutral pandaren race
(cherry picked from commit aac5581bfce1955d5f483521bf77d3d97397d201)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
-rw-r--r--src/server/game/Miscellaneous/SharedDefines.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 198ff620cd0..fe649eb31eb 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6332,6 +6332,7 @@ Team Player::TeamForRace(uint8 race)
{
case 0: return ALLIANCE;
case 1: return HORDE;
+ case 2: return PANDARIA_NEUTRAL;
}
TC_LOG_ERROR("entities.player", "Race ({}) has wrong teamid ({}) in DBC: wrong DBC files?", uint32(race), rEntry->Alliance);
}
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 7ca27a22cfc..822cd5ce54e 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -1138,6 +1138,7 @@ enum Team
//TEAM_HORDE_FORCES = 892,
//TEAM_SANCTUARY = 936,
//TEAM_OUTLAND = 980,
+ PANDARIA_NEUTRAL = 1249, // Starting pandas should have this team
TEAM_OTHER = 0 // if ReputationListId > 0 && Flags != FACTION_FLAG_TEAM_HEADER
};