Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4
Conflicts: .travis.yml README.md sql/updates/world/2015_04_18_00_world.sql sql/updates/world/2015_04_18_05_world_335.sql sql/updates/world/2015_04_26_03_world_335.sql sql/updates/world/2015_05_09_00_world_335.sql src/server/game/Conditions/ConditionMgr.h src/server/game/Entities/GameObject/GameObject.cpp src/server/game/Entities/GameObject/GameObject.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Spells/SpellInfo.cpp
This commit is contained in:
commit
82ea8da720
61 files changed
+1019
-626
No files matched your search
@@ -1354,7 +1354,7 @@ void WorldSession::HandleAlterAppearance(WorldPacket& recvData)
|
||||
if (bs_skinColor && (bs_skinColor->type != 3 || bs_skinColor->race != _player->getRace() || bs_skinColor->gender != _player->getGender()))
|
||||
return;
|
||||
|
||||
if (!Player::ValidateAppearance(_player->getRace(), _player->getClass(), _player->getGender(), bs_hair->hair_id, Color, uint8(_player->GetUInt32Value(PLAYER_FLAGS) >> 8), bs_facialHair->hair_id, bs_skinColor ? bs_skinColor->hair_id : 0))
|
||||
if (!Player::ValidateAppearance(_player->getRace(), _player->getClass(), _player->getGender(), bs_hair->hair_id, Color, _player->GetByteValue(PLAYER_BYTES, 1), bs_facialHair->hair_id, bs_skinColor ? bs_skinColor->hair_id : _player->GetByteValue(PLAYER_BYTES, 0)))
|
||||
return;
|
||||
|
||||
GameObject* go = _player->FindNearestGameObjectOfType(GAMEOBJECT_TYPE_BARBER_CHAIR, 5.0f);
|
||||
|
||||
Reference in new issue
Block a user