From 01f09ac96622d5a6a7b7432f6d49c85aa63b2c16 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 23 Mar 2023 08:05:44 -0400 Subject: [PATCH] Core/PacketIO: Fixed SMSG_ENABLE_BARBER_SHOP structure Port From (https://github.com/TrinityCore/TrinityCore/commit/d6d5d94ebe88e71b6250678f114d900871fcf054) --- Source/Game/Entities/GameObject/GameObject.cs | 4 +++- Source/Game/Networking/Packets/MiscPackets.cs | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 181e21a5e..f126fa85d 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -2337,7 +2337,9 @@ namespace Game.Entities Player player = user.ToPlayer(); - player.SendPacket(new EnableBarberShop()); + EnableBarberShop enableBarberShop = new(); + enableBarberShop.CustomizationScope = (byte)info.BarberChair.CustomizationScope; + player.SendPacket(enableBarberShop); // fallback, will always work player.TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(), (TeleportToOptions.NotLeaveTransport | TeleportToOptions.NotLeaveCombat | TeleportToOptions.NotUnSummonPet)); diff --git a/Source/Game/Networking/Packets/MiscPackets.cs b/Source/Game/Networking/Packets/MiscPackets.cs index c23732131..dc04cc59f 100644 --- a/Source/Game/Networking/Packets/MiscPackets.cs +++ b/Source/Game/Networking/Packets/MiscPackets.cs @@ -777,9 +777,14 @@ namespace Game.Networking.Packets public class EnableBarberShop : ServerPacket { + public byte CustomizationScope; + public EnableBarberShop() : base(ServerOpcodes.EnableBarberShop) { } - public override void Write() { } + public override void Write() + { + _worldPacket.WriteUInt8(CustomizationScope); + } } class PhaseShiftChange : ServerPacket