Skip to content

fix issue #3043: Gnome & Troll's wrong taxinodes #3056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jianggn1 wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix issue #3043: Gnome & Troll's wrong taxinodes #3056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/game/Handlers/TaxiHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ void WorldSession::SendTaxiMenu(Creature* unit)
data << uint32(1);
data << unit->GetObjectGuid();
data << uint32(curloc);
GetPlayer()->m_taxi.AppendTaximaskTo(data, GetPlayer()->IsTaxiCheater());
GetPlayer()->m_taxi.AppendTaximaskTo(data, GetPlayer()->IsTaxiCheater(), GetPlayer()->GetRace());
SendPacket(&data);
}

Expand Down
26 changes: 23 additions & 3 deletions src/game/Objects/PlayerTaxi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,32 @@ void PlayerTaxi::LoadTaxiMask(char const* data)
}
}

void PlayerTaxi::AppendTaximaskTo(ByteBuffer& data, bool all)
void PlayerTaxi::AppendTaximaskTo(ByteBuffer& data, bool all, uint32 raceId)
{
if (all)
{
for (uint32 i : sTaxiNodesMask)
data << uint32(i); // all existing nodes
if ((1 << (raceId - 1)) & RACEMASK_ALLIANCE) // alliance nodes
{
data << uint32(3456411898);
data << uint32(2148078929);
data << uint32(49991);
data << uint32(0);
data << uint32(0);
data << uint32(0);
data << uint32(0);
data << uint32(0);
}
else if ((1 << (raceId - 1)) & RACEMASK_HORDE) // horde nodes
{
data << uint32(830166528);
data << uint32(315656872);
data << uint32(56504);
data << uint32(0);
data << uint32(0);
data << uint32(0);
data << uint32(0);
data << uint32(0);
}
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/Objects/PlayerTaxi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class PlayerTaxi
else
return false;
}
void AppendTaximaskTo(ByteBuffer& data, bool all);
void AppendTaximaskTo(ByteBuffer& data, bool all, uint32 raceId);

// Destinations
bool LoadTaxiDestinationsFromString(std::string const& values, Team team);
Expand Down