Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Lacyway committed Dec 8, 2024
1 parent 61e732e commit eda70f0
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 24 deletions.
9 changes: 0 additions & 9 deletions Fika.Core/Console/FikaCommands.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/GameMode/CoopGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ public override async Task<LocalPlayer> vmethod_3(GameWorld gameWorld, int playe
CharacterControllerSpawner.Mode characterControllerMode, Func<float> getSensitivity,
Func<float> getAimingSensitivity, IStatisticsManager statisticsManager, ISession session,
ELocalMode localMode)
{
{
bool spawnedInSession = profile.Side == EPlayerSide.Savage || TransitControllerAbstractClass.IsTransit(profile.Id, out int _);
profile.SetSpawnedInSession(spawnedInSession);

Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Coop/Patches/SPTBugs/FixVFSDeleteFilePatch.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
3 changes: 1 addition & 2 deletions Fika.Core/Coop/Players/CoopPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -817,7 +816,7 @@ public override void OnDead(EDamageType damageType)
{
StartCoroutine(LocalPlayerDied());
}
}
}

/// <summary>
/// TODO: Refactor... BSG code makes this difficult
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/Utils/FikaBackendUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
1 change: 0 additions & 1 deletion Fika.Core/FikaPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Networking/FikaClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace Fika.Core.Networking
/// </summary>
public class FikaClient : MonoBehaviour, INetEventListener, IFikaNetworkManager
{
public CoopPlayer MyPlayer;
public CoopPlayer MyPlayer;
public int Ping = 0;
public int ServerFPS = 0;
public int ConnectedClients = 0;
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Networking/FikaServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public async Task Init()
else
{
logger.LogError("Init: Own profile was null!");
}
}
}

sendRate = FikaPlugin.SendRate.Value switch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Fika.Core/Networking/Websocket/FikaNotificationManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Linq;
using UnityEngine;
using WebSocketSharp;

Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/UI/Custom/MainMenuUIScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private void OnEnable()
{
if (userInterface != null)
{
userInterface.SetActive(false);
userInterface.SetActive(false);
}
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/UI/Patches/TarkovApplication_method_18_Patch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ internal static void Postfix()
{
if (!FikaNotificationManager.Exists)
{
Singleton<PreloaderUI>.Instance.gameObject.AddComponent<FikaNotificationManager>();
Singleton<PreloaderUI>.Instance.gameObject.AddComponent<FikaNotificationManager>();
}
}
}
Expand Down

0 comments on commit eda70f0

Please sign in to comment.