aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorazazel <azazel.kon@gmail.com>2010-08-04 22:12:43 +0600
committerazazel <azazel.kon@gmail.com>2010-08-04 22:12:43 +0600
commit40e16bbbdb59d6c860fa9f47fae645cb7771b236 (patch)
treee3d45e0df6bc1e17c92a257ada712be19796e2c2 /src
parent362ae2d4c6393063e32c328f752b88dd1bde5db7 (diff)
Add gender field to SMSG_WHO packet (author: MaS0n)
Fix compile error --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
-rw-r--r--src/server/game/Server/Protocol/Handlers/MiscHandler.cpp7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a7226a8fb7e..06c423ce796 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7723,11 +7723,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
{
// Guard Dog
case 201:
+ {
triggered_spell_id = 54445;
target = this;
float addThreat = SpellMgr::CalculateSpellEffectAmount(procSpell, 0, this) * triggerAmount / 100.f;
pVictim->AddThreat(this, addThreat);
break;
+ }
// Silverback
case 1582:
triggered_spell_id = dummySpell->Id == 62765 ? 62801 : 62800;
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 88e4e70998d..b7aa9b66979 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -271,6 +271,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data)
continue;
uint32 pzoneid = itr->second->GetZoneId();
+ uint8 gender = itr->second->getGender();
bool z_show = true;
for (uint32 i = 0; i < zones_count; ++i)
@@ -326,12 +327,12 @@ void WorldSession::HandleWhoOpcode(WorldPacket & recv_data)
if (!s_show)
continue;
- data << pname; // player name
- data << gname; // guild name
+ data << pname; // player name
+ data << gname; // guild name
data << uint32(lvl); // player level
data << uint32(class_); // player class
data << uint32(race); // player race
- data << uint8(0); // new 2.4.0
+ data << uint8(gender); // player gender
data << uint32(pzoneid); // player zone id
// 49 is maximum player count sent to client - can be overridden