From 5dc0704a425b8baf40627b9f6337edac189e4c18 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Sun, 30 Jan 2022 12:54:43 +0100 Subject: [PATCH] feat(client): disable pet walk if user actions are not allowed --- src/Core/NosSmooth.LocalClient/NostaleLocalClient.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Core/NosSmooth.LocalClient/NostaleLocalClient.cs b/src/Core/NosSmooth.LocalClient/NostaleLocalClient.cs index 99cbd29..cd46016 100644 --- a/src/Core/NosSmooth.LocalClient/NostaleLocalClient.cs +++ b/src/Core/NosSmooth.LocalClient/NostaleLocalClient.cs @@ -32,6 +32,7 @@ public class NostaleLocalClient : BaseNostaleClient { private readonly NetworkBinding _networkBinding; private readonly PlayerManagerBinding _playerManagerBinding; + private readonly PetManagerBinding _petManagerBinding; private readonly ControlCommands _controlCommands; private readonly IPacketSerializer _packetSerializer; private readonly IPacketHandler _packetHandler; @@ -46,6 +47,7 @@ public class NostaleLocalClient : BaseNostaleClient /// /// The network binding. /// The player manager binding. + /// The pet manager binding. /// The control commands. /// The command processor. /// The packet serializer. @@ -57,6 +59,7 @@ public class NostaleLocalClient : BaseNostaleClient ( NetworkBinding networkBinding, PlayerManagerBinding playerManagerBinding, + PetManagerBinding petManagerBinding, ControlCommands controlCommands, CommandProcessor commandProcessor, IPacketSerializer packetSerializer, @@ -70,6 +73,7 @@ public class NostaleLocalClient : BaseNostaleClient _options = options.Value; _networkBinding = networkBinding; _playerManagerBinding = playerManagerBinding; + _petManagerBinding = petManagerBinding; _controlCommands = controlCommands; _packetSerializer = packetSerializer; _packetHandler = packetHandler; @@ -87,6 +91,7 @@ public class NostaleLocalClient : BaseNostaleClient _playerManagerBinding.FollowEntityCall += FollowEntity; _playerManagerBinding.WalkCall += Walk; + _petManagerBinding.PetWalkCall += PetWalk; try { @@ -101,6 +106,7 @@ public class NostaleLocalClient : BaseNostaleClient _networkBinding.PacketReceive -= ReceiveCallback; _playerManagerBinding.FollowEntityCall -= FollowEntity; _playerManagerBinding.WalkCall -= Walk; + _petManagerBinding.PetWalkCall -= PetWalk; return Result.FromSuccess(); } @@ -209,6 +215,11 @@ public class NostaleLocalClient : BaseNostaleClient return true; } + private bool PetWalk(PetManager petManager, ushort x, ushort y) + { + return _controlCommands.AllowUserActions; + } + private bool Walk(ushort x, ushort y) { return _controlCommands.AllowUserActions; -- 2.48.1