Merge pull request #162 from project-fika/dev

Dev > Main

Fika.Core/Coop/Airdrops/FikaAirdropsManager.cs

@@ -9,7 +9,6 @@
 using Fika.Core.Coop.Utils;
 using Fika.Core.Networking;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using SPT.Custom.Airdrops;
 using System;
 using System.Collections;

Fika.Core/Coop/BTR/FikaBTRManager_Client.cs

@@ -10,7 +10,6 @@
 using Fika.Core.Networking;
 using GPUInstancer;
 using HarmonyLib;
-using LiteNetLib.Utils;
 using SPT.Custom.BTR;
 using SPT.Custom.BTR.Utils;
 using SPT.SinglePlayer.Utils.TraderServices;

Fika.Core/Coop/BTR/FikaBTRManager_Host.cs

@@ -11,7 +11,6 @@
 using GPUInstancer;
 using HarmonyLib;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using SPT.Custom.BTR;
 using SPT.Custom.BTR.Utils;
 using SPT.SinglePlayer.Utils.TraderServices;

Fika.Core/Coop/Components/CoopExfilManager.cs

@@ -6,7 +6,6 @@
 using Fika.Core.Coop.Utils;
 using Fika.Core.Networking;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;

Fika.Core/Coop/Components/CoopHalloweenEventManager.cs

@@ -4,7 +4,6 @@
 using Fika.Core.Coop.Utils;
 using Fika.Core.Networking;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using System;
 using UnityEngine;
 

Fika.Core/Coop/Components/CoopHandler.cs

@@ -10,7 +10,6 @@
 using Fika.Core.Networking;
 using Fika.Core.Utils;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -505,9 +504,13 @@ private ObservedCoopPlayer SpawnObservedPlayer(Profile profile, Vector3 position
 #if DEBUG
 			Logger.LogInfo($"CreateLocalPlayer::{profile.Info.Nickname}::Spawned.");
 #endif
-
-			SetWeaponInHandsOfNewPlayer(otherPlayer);
-
+			otherPlayer.SetFirstAvailableItem((result) =>
+			{
+				if (result.Failed)
+				{
+					Logger.LogError($"SetFirstAvailableItem: Failed to set the first available item for {otherPlayer.Profile.Info.MainProfileNickname}");
+				}
+			});
 			return otherPlayer;
 		}
 
@@ -554,47 +557,5 @@ private IEnumerator AddClientToBotEnemies(BotsController botController, LocalPla
 				Logger.LogError($"Failed to add {playerToAdd.Profile.Nickname} to the enemy list.");
 			}
 		}
-
-		/// <summary>
-		/// Attempts to set up the New Player with the current weapon after spawning
-		/// </summary>
-		/// <param name="player">The player to set the item on</param>
-		public void SetWeaponInHandsOfNewPlayer(Player player)
-		{
-			EquipmentClass equipment = player.Profile.Inventory.Equipment;
-			if (equipment == null)
-			{
-				Logger.LogError($"SetWeaponInHandsOfNewPlayer: {player.Profile.Nickname}, {player.Profile.ProfileId} has no Equipment!");
-			}
-			Item item = null;
-
-			if (equipment.GetSlot(EquipmentSlot.FirstPrimaryWeapon).ContainedItem != null)
-			{
-				item = equipment.GetSlot(EquipmentSlot.FirstPrimaryWeapon).ContainedItem;
-			}
-
-			if (item == null && equipment.GetSlot(EquipmentSlot.SecondPrimaryWeapon).ContainedItem != null)
-			{
-				item = equipment.GetSlot(EquipmentSlot.SecondPrimaryWeapon).ContainedItem;
-			}
-
-			if (item == null && equipment.GetSlot(EquipmentSlot.Holster).ContainedItem != null)
-			{
-				item = equipment.GetSlot(EquipmentSlot.Holster).ContainedItem;
-			}
-
-			if (item == null && equipment.GetSlot(EquipmentSlot.Scabbard).ContainedItem != null)
-			{
-				item = equipment.GetSlot(EquipmentSlot.Scabbard).ContainedItem;
-			}
-
-			player.SetItemInHands(item, (IResult) =>
-			{
-				if (IResult.Failed == true)
-				{
-					Logger.LogError($"SetWeaponInHandsOfNewPlayer: Unable to set item {item} in hands for {player.Profile.Nickname}, {player.Profile.ProfileId}");
-				}
-			});
-		}
 	}
 }

Fika.Core/Coop/FreeCamera/FreeCamera.cs

@@ -7,7 +7,6 @@
 using Fika.Core.Utils;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using UnityEngine;
 

Fika.Core/Coop/GameMode/CoopGame.cs

@@ -36,7 +36,6 @@
 using HarmonyLib;
 using JsonType;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using Newtonsoft.Json;
 using SPT.Common.Http;
 using SPT.SinglePlayer.Models.Progression;
@@ -738,6 +737,14 @@ private IEnumerator WaitForOtherPlayers()
 					{
 						DynamicAI.AddHumans();
 					}
+
+					InformationPacket finalPacket = new(false)
+					{
+						NumberOfPlayers = server.NetServer.ConnectedPeersCount,
+						ReadyPlayers = server.ReadyClients
+					};
+
+					server.SendDataToAll(ref finalPacket, DeliveryMethod.ReliableOrdered);
 				}
 				else
 				{
@@ -2304,7 +2311,7 @@ public void HandleExit()
 				if (screenManager.CheckCurrentScreen(EEftScreenType.Reconnect))
 				{
 					screenManager.CloseAllScreensForced();
-				}				
+				}
 				localGame.gparam_0.Player.OnGameSessionEnd(exitStatus, localGame.PastTime, localGame.Location_0.Id, exitName);
 				localGame.CleanUp();
 				localGame.Status = GameStatus.Stopped;
@@ -2324,7 +2331,7 @@ public void HandleExit()
 				}
 				localGame.iSession.OfflineRaidEnded(exitStatus, exitName, timeSpan.TotalSeconds).HandleExceptions();
 				MonoBehaviourSingleton<BetterAudio>.Instance.FadeOutVolumeAfterRaid();
-				StaticManager staticManager = StaticManager.Instance;				
+				StaticManager staticManager = StaticManager.Instance;
 				float num = delay;
 				EndAction = new Action(FireCallback);
 				staticManager.WaitSeconds(num, EndAction);

Fika.Core/Coop/Lighthouse/FikaLighthouseProgressionClass.cs

@@ -6,7 +6,6 @@
 using Fika.Core.Networking;
 using Fika.Core.Networking.Packets.GameWorld;
 using LiteNetLib;
-using LiteNetLib.Utils;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;

Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedFirearmController.cs

@@ -149,7 +149,7 @@ public override void OnPlayerDead()
 			catch (Exception ex)
 			{
 				FikaPlugin.Instance.FikaLogger.LogError("CoopObservedFirearmController: Exception was caught: " + ex.Message);
-			}	
+			}
 		}
 
 		private IEnumerator BreakFiringLoop()

Fika.Core/Coop/ObservedClasses/ObservedInventoryController.cs

@@ -38,19 +38,9 @@ public override bool IsInventoryBlocked()
 			return false;
 		}
 
-		/*public override void InProcess(TraderControllerClass executor, Item item, ItemAddress to, bool succeed, GInterface338 operation, Callback callback)
-        {
-            if (!succeed)
-            {
-                callback.Succeed();
-                return;
-            }
-            if (!executor.CheckTransferOwners(item, to, out Error error))
-            {
-                callback.Fail(error.ToString());
-                return;
-            }
-            callback.Succeed();
-        }*/
+		public void SetNewID(MongoID newId)
+		{
+			mongoID_0 = newId;
+		}
 	}
 }

Fika.Core/Coop/PacketHandlers/BotPacketSender.cs

@@ -68,7 +68,7 @@ protected void FixedUpdate()
 
 			Server.SendDataToAll(ref playerStatePacket, DeliveryMethod.Unreliable);
 
-			if (!mover.IsMoving || mover.Pause)
+			if (!mover.IsMoving || mover.Pause || player.MovementContext.CanWalk)
 			{
 				player.LastDirection = Vector2.zero;
 			}

Fika.Core/Coop/Patches/LocalGame/GameWorld_Create_Patch.cs

@@ -1,6 +1,5 @@
 using EFT;
 using Fika.Core.Coop.ClientClasses;
-using Fika.Core.Coop.GameMode;
 using Fika.Core.Coop.Utils;
 using HarmonyLib;
 using SPT.Reflection.Patching;

Fika.Core/Coop/Players/CoopBot.cs

@@ -14,7 +14,6 @@
 using Fika.Core.Coop.Utils;
 using Fika.Core.Networking;
 using Fika.Core.Utils;
-using LiteNetLib.Utils;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -211,9 +210,9 @@ public override void OnDead(EDamageType damageType)
 					if (LastAggressor is CoopPlayer aggressor)
 					{
 						if (aggressor.gameObject.name.StartsWith("Player_") || aggressor.IsYourPlayer)
-						NotificationManagerClass.DisplayMessageNotification(string.Format(LocaleUtils.KILLED_BOSS.Localized(),
-							[ColorizeText(Colors.GREEN, LastAggressor.Profile.Info.MainProfileNickname), ColorizeText(Colors.BROWN, name)]),
-							iconType: EFT.Communications.ENotificationIconType.Friend);
+							NotificationManagerClass.DisplayMessageNotification(string.Format(LocaleUtils.KILLED_BOSS.Localized(),
+								[ColorizeText(Colors.GREEN, LastAggressor.Profile.Info.MainProfileNickname), ColorizeText(Colors.BROWN, name)]),
+								iconType: EFT.Communications.ENotificationIconType.Friend);
 					}
 				}
 			}

Fika.Core/Coop/Players/CoopPlayer.cs

@@ -735,7 +735,7 @@ public override void Move(Vector2 direction)
 				base.Move(direction);
 				LastDirection = direction;
 			}
-		}				
+		}
 
 		private void HandleInteractPacket(WorldInteractionPacket packet)
 		{
@@ -1098,14 +1098,19 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet)
 					try
 					{
 						GStruct411 result = ToInventoryOperation(binaryReader.ReadPolymorph<GClass1543>());
+						if (!result.Succeeded)
+						{
+							FikaPlugin.Instance.FikaLogger.LogError($"HandleInventoryPacket::Unable to process descriptor from netid {NetId}, error: {result.Error}");
+							return;
+						}
 
 						InventoryOperationHandler opHandler = new(result);
 
 						opHandler.opResult.Value.vmethod_0(new Callback(opHandler.HandleResult), false);
 					}
 					catch (Exception exception)
 					{
-						FikaPlugin.Instance.FikaLogger.LogError($"ItemControllerExecutePacket::Exception thrown: {exception}");
+						FikaPlugin.Instance.FikaLogger.LogError($"HandleInventoryPacket::Exception thrown on netId {NetId}, {Profile.Info.MainProfileNickname}: {exception}");
 						if (FikaBackendUtils.IsServer)
 						{
 							OperationCallbackPacket callbackPacket = new(NetId, packet.ItemControllerExecutePacket.CallbackId, EOperationStatus.Failed);
@@ -1115,7 +1120,7 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet)
 				}
 				else
 				{
-					FikaPlugin.Instance.FikaLogger.LogError("ItemControllerExecutePacket: inventory was null!");
+					FikaPlugin.Instance.FikaLogger.LogError("HandleInventoryPacket: inventory was null!");
 					if (FikaBackendUtils.IsServer)
 					{
 						OperationCallbackPacket callbackPacket = new(NetId, packet.ItemControllerExecutePacket.CallbackId, EOperationStatus.Failed);

Fika.Core/Coop/Players/ObservedCoopPlayer.cs

@@ -899,7 +899,7 @@ public void InitObservedPlayer(bool isDedicatedHost)
 
 				if (FikaPlugin.ShowNotifications.Value && !isDedicatedHost)
 				{
-					NotificationManagerClass.DisplayMessageNotification(string.Format(LocaleUtils.GROUP_MEMBER_SPAWNED.Localized(), 
+					NotificationManagerClass.DisplayMessageNotification(string.Format(LocaleUtils.GROUP_MEMBER_SPAWNED.Localized(),
 						ColorizeText(Colors.GREEN, Profile.Info.MainProfileNickname)),
 					EFT.Communications.ENotificationDurationType.Default, EFT.Communications.ENotificationIconType.Friend);
 				}

Fika.Core/FikaPlugin.cs

@@ -49,7 +49,7 @@ namespace Fika.Core
 	/// Originally by: Paulov <br/>
 	/// Re-written by: Lacyway
 	/// </summary>
-	[BepInPlugin("com.fika.core", "Fika.Core", "0.9.9003")]
+	[BepInPlugin("com.fika.core", "Fika.Core", "0.9.9015")]
 	[BepInProcess("EscapeFromTarkov.exe")]
 	[BepInDependency("com.SPT.custom", BepInDependency.DependencyFlags.HardDependency)] // This is used so that we guarantee to load after spt-custom, that way we can disable its patches
 	[BepInDependency("com.SPT.singleplayer", BepInDependency.DependencyFlags.HardDependency)] // This is used so that we guarantee to load after spt-singleplayer, that way we can disable its patches
@@ -241,7 +241,7 @@ protected void Awake()
 #if GOLDMASTER
             new TOS_Patch().Enable();
 #endif
-			OfficialVersion.SettingChanged += OfficialVersion_SettingChanged;			
+			OfficialVersion.SettingChanged += OfficialVersion_SettingChanged;
 
 			DisableSPTPatches();
 			EnableOverridePatches();
@@ -291,7 +291,7 @@ private void VerifyServerVersion()
 			else
 			{
 				FikaLogger.LogInfo($"Server version check passed. Expected: >{RequiredServerVersion}, received: {serverVersion}");
-			}			
+			}
 		}
 
 		/// <summary>

Fika.Core/Networking/FikaClient.cs

@@ -17,6 +17,7 @@
 using Fika.Core.Coop.Factories;
 using Fika.Core.Coop.GameMode;
 using Fika.Core.Coop.Lighthouse;
+using Fika.Core.Coop.ObservedClasses;
 using Fika.Core.Coop.Players;
 using Fika.Core.Coop.Utils;
 using Fika.Core.Modding;
@@ -120,6 +121,7 @@ public async void Init()
 			packetProcessor.SubscribeNetSerializable<WorldLootPacket>(OnWorldLootPacketReceived);
 			packetProcessor.SubscribeNetSerializable<ReconnectPacket>(OnReconnectPacketReceived);
 			packetProcessor.SubscribeNetSerializable<LightkeeperGuardDeathPacket>(OnLightkeeperGuardDeathPacketReceived);
+			packetProcessor.SubscribeNetSerializable<ResyncInventoryPacket>(OnResyncInventoryPacketReceived);
 
 			netClient = new NetManager(this)
 			{
@@ -168,6 +170,29 @@ public async void Init()
 			FikaEventDispatcher.DispatchEvent(new FikaClientCreatedEvent(this));
 		}
 
+		private void OnResyncInventoryPacketReceived(ResyncInventoryPacket packet)
+		{
+			if (Players.TryGetValue(packet.NetId, out CoopPlayer playerToApply))
+			{
+				if (playerToApply is ObservedCoopPlayer observedPlayer)
+				{
+					if (observedPlayer.InventoryControllerClass is ObservedInventoryController observedController)
+					{
+						observedController.SetNewID(new(packet.MongoId));
+					}
+					return;
+				}
+				if (playerToApply.IsYourPlayer)
+				{
+					ResyncInventoryPacket response = new(playerToApply.NetId)
+					{
+						MongoId = playerToApply.InventoryControllerClass.CurrentId.ToString()
+					};
+					SendData(ref response, DeliveryMethod.ReliableOrdered);
+				}
+			}
+		}
+
 		private void OnReconnectPacketReceived(ReconnectPacket packet)
 		{
 			if (!packet.IsRequest)