aboutsummaryrefslogtreecommitdiff
path: root/src/game/GameObject.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-07-08 14:29:54 +0200
committerQAston <none@none>2009-07-08 14:29:54 +0200
commit88ffd0082ac667993445ce0817e9297ec5d57d14 (patch)
tree62fd9e977b239925dfcb8e5a714f282f1f928acc /src/game/GameObject.cpp
parent68b58c1433c2220db32e0f4c222daa76356a85d8 (diff)
parent5afb67e7da7790403726a620557e171d1cdf6297 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
-rw-r--r--src/game/GameObject.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index db7e61d53b2..b690dbccddb 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -1344,8 +1344,7 @@ void GameObject::Use(Unit* user)
// fallback, will always work
player->TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET);
- WorldPacket data(SMSG_ENABLE_BARBER_SHOP, 1);
- data << uint8(0); // unk 3.1
+ WorldPacket data(SMSG_ENABLE_BARBER_SHOP, 0);
player->GetSession()->SendPacket(&data);
player->SetStandState(UNIT_STAND_STATE_SIT_LOW_CHAIR+info->barberChair.chairheight);