diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-09 03:05:45 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-09 03:05:45 +0100 |
| commit | 8a88994a821a485c9dcb4d14139d88396e27e781 (patch) | |
| tree | d812002849854c4fcc27b07ec9abe9ae8f616009 | |
| parent | 7c4e7a9ebcb41a0d0f34df761409a445d532f965 (diff) | |
Fix a merge failure, I need to sleep...
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 6684b09c5ca..32ed1d2b27f 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1396,7 +1396,7 @@ void WorldSession::HandleAlterAppearance(WorldPacket& recvData) if (bs_skinColor && (bs_skinColor->type != 3 || bs_skinColor->race != _player->getRace() || bs_skinColor->gender != _player->getGender())) return; - uint32 cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id, bs_skinColor); + GameObject* go = _player->FindNearestGameObjectOfType(GAMEOBJECT_TYPE_BARBER_CHAIR, 5.0f); if (!go) { WorldPacket data(SMSG_BARBER_SHOP_RESULT, 4); |