diff --git a/Fika.Core/Coop/BotClasses/BotMovementContext.cs b/Fika.Core/Coop/BotClasses/BotMovementContext.cs deleted file mode 100644 index 5799adeb..00000000 --- a/Fika.Core/Coop/BotClasses/BotMovementContext.cs +++ /dev/null @@ -1,29 +0,0 @@ -using EFT; -using Fika.Core.Coop.Players; -using System; -using UnityEngine; - -namespace Fika.Core.Coop.BotClasses -{ - public sealed class BotMovementContext : MovementContext - { - private CoopBot Bot; - - public override void ApplyGravity(ref Vector3 motion, float deltaTime, bool stickToGround) - { - if (Bot.AIData.BotOwner.BotState == EBotState.NonActive) - { - return; - } - - base.ApplyGravity(ref motion, deltaTime, stickToGround); - } - - public new static BotMovementContext Create(Player player, Func animatorGetter, Func characterControllerGetter, LayerMask groundMask) - { - BotMovementContext movementContext = Create(player, animatorGetter, characterControllerGetter, groundMask); - movementContext.Bot = (CoopBot)player; - return movementContext; - } - } -} diff --git a/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs b/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs index f734a1b4..d2c7a663 100644 --- a/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs +++ b/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs @@ -45,16 +45,6 @@ public override IPlayerSearchController PlayerSearchController } } - /*public override void RollBack() - { - base.RollBack(); - ResyncInventoryIdPacket packet = new(coopPlayer.NetId) - { - MongoId = mongoID_0 - }; - coopPlayer.PacketSender.SendPacket(ref packet, false); - }*/ - public override void GetTraderServicesDataFromServer(string traderId) { if (FikaBackendUtils.IsClient) @@ -272,37 +262,5 @@ public readonly struct ServerOperationStatus(EOperationStatus status, string err public readonly EOperationStatus Status = status; public readonly string Error = error; } - - /*private class ClientInventoryCallbackManager - { - public Result result; - public ClientInventoryOperationHandler clientOperationManager; - - public void HandleResult(IResult executeResult) - { - if (!executeResult.Succeed && (executeResult.Error is not "skipped skippable" or "skipped _completed")) - { - FikaPlugin.Instance.FikaLogger.LogError($"{clientOperationManager.inventoryController.ID} - Client operation critical failure: {clientOperationManager.inventoryController.ID} - {clientOperationManager.operation}\r\nError: {executeResult.Error}"); - } - - clientOperationManager.localOperationStatus = EOperationStatus.Succeeded; - - if (clientOperationManager.localOperationStatus == clientOperationManager.serverOperationStatus) - { - clientOperationManager.operation.Dispose(); - clientOperationManager.callback.Invoke(result); - return; - } - - if (clientOperationManager.serverOperationStatus != null) - { - if (clientOperationManager.serverOperationStatus == EOperationStatus.Failed) - { - clientOperationManager.operation.Dispose(); - clientOperationManager.callback.Invoke(result); - } - } - } - }*/ } } \ No newline at end of file diff --git a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs index 58346310..83608723 100644 --- a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs +++ b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs @@ -67,7 +67,7 @@ public override bool CanStartReload() return base.CanStartReload(); } - public override bool CanPressTrigger() + /*public override bool CanPressTrigger() { if (isClient) { @@ -75,7 +75,7 @@ public override bool CanPressTrigger() } return base.CanPressTrigger(); - } + }*/ public Player.BaseAnimationOperation Weapon1() { diff --git a/Fika.Core/Coop/Players/CoopBot.cs b/Fika.Core/Coop/Players/CoopBot.cs index acabc5c4..373bcc1b 100644 --- a/Fika.Core/Coop/Players/CoopBot.cs +++ b/Fika.Core/Coop/Players/CoopBot.cs @@ -121,12 +121,6 @@ public override void ConnectSkillManager() // Do nothing } - public override void CreateMovementContext() - { - LayerMask movement_MASK = EFTHardSettings.Instance.MOVEMENT_MASK; - MovementContext = BotMovementContext.Create(this, GetBodyAnimatorCommon, GetCharacterControllerCommon, movement_MASK); - } - public override void OnBeenKilledByAggressor(IPlayer aggressor, DamageInfoStruct damageInfo, EBodyPart bodyPart, EDamageType lethalDamageType) { base.OnBeenKilledByAggressor(aggressor, damageInfo, bodyPart, lethalDamageType);