diff --git a/Fika.Core/Console/FikaCommands.cs b/Fika.Core/Console/FikaCommands.cs index 681d2cf7..c297affb 100644 --- a/Fika.Core/Console/FikaCommands.cs +++ b/Fika.Core/Console/FikaCommands.cs @@ -1,17 +1,8 @@ using Comfort.Common; using EFT; using EFT.Console.Core; -using EFT.InventoryLogic; using EFT.UI; -using Fika.Core.Coop.Components; using Fika.Core.Coop.GameMode; -using Fika.Core.Coop.Players; -using Fika.Core.Coop.Utils; -using Fika.Core.Networking; -using HarmonyLib; -using System; -using System.Collections.Generic; -using UnityEngine; namespace Fika.Core.Console { diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs index af4377a4..d1a2e3ef 100644 --- a/Fika.Core/Coop/GameMode/CoopGame.cs +++ b/Fika.Core/Coop/GameMode/CoopGame.cs @@ -843,7 +843,7 @@ public override async Task vmethod_3(GameWorld gameWorld, int playe CharacterControllerSpawner.Mode characterControllerMode, Func getSensitivity, Func getAimingSensitivity, IStatisticsManager statisticsManager, ISession session, ELocalMode localMode) - { + { bool spawnedInSession = profile.Side == EPlayerSide.Savage || TransitControllerAbstractClass.IsTransit(profile.Id, out int _); profile.SetSpawnedInSession(spawnedInSession); diff --git a/Fika.Core/Coop/Patches/SPTBugs/FixVFSDeleteFilePatch.cs b/Fika.Core/Coop/Patches/SPTBugs/FixVFSDeleteFilePatch.cs index b9f4b351..6a00958e 100644 --- a/Fika.Core/Coop/Patches/SPTBugs/FixVFSDeleteFilePatch.cs +++ b/Fika.Core/Coop/Patches/SPTBugs/FixVFSDeleteFilePatch.cs @@ -1,6 +1,6 @@ -using SPT.Reflection.Patching; +using SPT.Common.Utils; +using SPT.Reflection.Patching; using System.Reflection; -using SPT.Common.Utils; namespace Fika.Core.Coop.Patches.SPTBugs { diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs index d02f37e9..eca874b0 100644 --- a/Fika.Core/Coop/Players/CoopPlayer.cs +++ b/Fika.Core/Coop/Players/CoopPlayer.cs @@ -8,7 +8,6 @@ using EFT.Interactive; using EFT.InventoryLogic; using EFT.SynchronizableObjects; -using EFT.UI; using EFT.Vehicle; using Fika.Core.Coop.ClientClasses; using Fika.Core.Coop.ClientClasses.HandsControllers; @@ -817,7 +816,7 @@ public override void OnDead(EDamageType damageType) { StartCoroutine(LocalPlayerDied()); } - } + } /// /// TODO: Refactor... BSG code makes this difficult diff --git a/Fika.Core/Coop/Utils/FikaBackendUtils.cs b/Fika.Core/Coop/Utils/FikaBackendUtils.cs index 83977ec9..e156929a 100644 --- a/Fika.Core/Coop/Utils/FikaBackendUtils.cs +++ b/Fika.Core/Coop/Utils/FikaBackendUtils.cs @@ -38,7 +38,7 @@ public static class FikaBackendUtils public static bool IsDedicatedGame { get; set; } = false; public static bool IsTransit { get; internal set; } = false; public static bool IsSpectator { get; internal set; } = false; - public static bool IsHostNatPunch { get; internal set; } = false; + public static bool IsHostNatPunch { get; internal set; } = false; public static int HostExpectedNumberOfPlayers { get; set; } = 1; public static string RemoteIp { get; internal set; } public static int RemotePort { get; internal set; } diff --git a/Fika.Core/FikaPlugin.cs b/Fika.Core/FikaPlugin.cs index 888e5e6a..c21ee2d3 100644 --- a/Fika.Core/FikaPlugin.cs +++ b/Fika.Core/FikaPlugin.cs @@ -22,7 +22,6 @@ using SPT.Custom.Patches; using SPT.Custom.Utils; using SPT.SinglePlayer.Patches.MainMenu; -using SPT.SinglePlayer.Patches.RaidFix; using SPT.SinglePlayer.Patches.ScavMode; using System; using System.Collections; diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs index d9e559fd..d9816773 100644 --- a/Fika.Core/Networking/FikaClient.cs +++ b/Fika.Core/Networking/FikaClient.cs @@ -41,7 +41,7 @@ namespace Fika.Core.Networking /// public class FikaClient : MonoBehaviour, INetEventListener, IFikaNetworkManager { - public CoopPlayer MyPlayer; + public CoopPlayer MyPlayer; public int Ping = 0; public int ServerFPS = 0; public int ConnectedClients = 0; diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs index b08ccafa..ce1d796c 100644 --- a/Fika.Core/Networking/FikaServer.cs +++ b/Fika.Core/Networking/FikaServer.cs @@ -133,7 +133,7 @@ public async Task Init() else { logger.LogError("Init: Own profile was null!"); - } + } } sendRate = FikaPlugin.SendRate.Value switch diff --git a/Fika.Core/Networking/Websocket/DedicatedRaidWebSocketClient.cs b/Fika.Core/Networking/Websocket/DedicatedRaidWebSocketClient.cs index ed2013c5..c9481cad 100644 --- a/Fika.Core/Networking/Websocket/DedicatedRaidWebSocketClient.cs +++ b/Fika.Core/Networking/Websocket/DedicatedRaidWebSocketClient.cs @@ -5,11 +5,9 @@ using EFT.UI.Matchmaker; using Fika.Core.Coop.Utils; using Fika.Core.UI.Custom; -using Fika.Core.UI.Patches.MatchmakerAcceptScreen; using Newtonsoft.Json.Linq; using SPT.Common.Http; using System; -using UnityEngine; using WebSocketSharp; namespace Fika.Core.Networking.Websocket diff --git a/Fika.Core/Networking/Websocket/FikaNotificationManager.cs b/Fika.Core/Networking/Websocket/FikaNotificationManager.cs index 3fc421cf..a2f31af4 100644 --- a/Fika.Core/Networking/Websocket/FikaNotificationManager.cs +++ b/Fika.Core/Networking/Websocket/FikaNotificationManager.cs @@ -8,7 +8,6 @@ using System; using System.Collections; using System.Collections.Concurrent; -using System.Linq; using UnityEngine; using WebSocketSharp; diff --git a/Fika.Core/UI/Custom/MainMenuUIScript.cs b/Fika.Core/UI/Custom/MainMenuUIScript.cs index 5384e714..6da28ca9 100644 --- a/Fika.Core/UI/Custom/MainMenuUIScript.cs +++ b/Fika.Core/UI/Custom/MainMenuUIScript.cs @@ -58,7 +58,7 @@ private void OnEnable() { if (userInterface != null) { - userInterface.SetActive(false); + userInterface.SetActive(false); } return; } diff --git a/Fika.Core/UI/Patches/MainMenuUI/GClass3421_ShowAction_Patch.cs b/Fika.Core/UI/Patches/MainMenuUI/GClass3421_ShowAction_Patch.cs index 13243014..bffcd976 100644 --- a/Fika.Core/UI/Patches/MainMenuUI/GClass3421_ShowAction_Patch.cs +++ b/Fika.Core/UI/Patches/MainMenuUI/GClass3421_ShowAction_Patch.cs @@ -20,7 +20,7 @@ public static void Postfix(GClass3511 __instance) { if (MainMenuUIScript.Exist) { - MainMenuUIScript.Instance.UpdatePresence(EFikaPlayerPresence.IN_STASH); + MainMenuUIScript.Instance.UpdatePresence(EFikaPlayerPresence.IN_STASH); } } } diff --git a/Fika.Core/UI/Patches/TarkovApplication_method_18_Patch.cs b/Fika.Core/UI/Patches/TarkovApplication_method_18_Patch.cs index 352f4a72..62e31e7d 100644 --- a/Fika.Core/UI/Patches/TarkovApplication_method_18_Patch.cs +++ b/Fika.Core/UI/Patches/TarkovApplication_method_18_Patch.cs @@ -22,7 +22,7 @@ internal static void Postfix() { if (!FikaNotificationManager.Exists) { - Singleton.Instance.gameObject.AddComponent(); + Singleton.Instance.gameObject.AddComponent(); } } }