butubb/azerothcore-wotlk
1
0
Fork 0
forked from mirror/azerothcore-wotlk
Code Pull Requests Activity

[AZTH] Fixed bug on GetTeamId, reverse condition

Browse Source
This commit is contained in:
Yehonal
2016-07-26 13:06:23 +02:00
parent f80cef2783
commit 87ff8c7828
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/azerothshard/src/server/plugins/CrossFaction/CrossFaction.cpp
+5 -1
View File
@@ -58,7 +58,11 @@ void CrossFaction::UpdatePlayerTeam(Group* group, uint64 guid, bool reset /* = f
{
uint8 raceid = itr->second;
ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(raceid);
player->setFaction(rEntry ? rEntry->FactionID : 0);
if (rEntry) {
player->setFaction(rEntry->FactionID);
player->setTeamId(Player::TeamIdForRace(raceid));
return;
}
}
}
}
src/server/game/Entities/Player/Player.h
+1 -1
View File
@@ -2126,7 +2126,7 @@ class Player : public Unit, public GridObject<Player>
void CheckAreaExploreAndOutdoor(void);
static TeamId TeamIdForRace(uint8 race);
TeamId GetTeamId(bool original = false) const { return original ? m_team : TeamIdForRace(getRace()); };
TeamId GetTeamId(bool original = false) const { return original ? TeamIdForRace(getRace()) : m_team; };
void setFactionForRace(uint8 race);
void setTeamId(TeamId teamid) { m_team = teamid; };