diff --git a/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs b/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs index 99e3eb6e..be966aba 100644 --- a/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs +++ b/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs @@ -39,9 +39,9 @@ public override void Execute(GClass2854 operation, [CanBeNull] Callback callback #endif // Do not replicate picking up quest items, throws an error on the other clients - if (operation is GClass2856 pickupOperation) + if (operation is MoveOperationClass moveOperation) { - Item lootedItem = pickupOperation.Item; + Item lootedItem = moveOperation.Item; if (lootedItem.Template.QuestItem) { if (CoopPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController) @@ -62,7 +62,7 @@ public override void Execute(GClass2854 operation, [CanBeNull] Callback callback // Do not replicate quest operations // Check for GClass increments - if (operation is GClass2883 or GClass2896) + if (operation is GClass2897 or GClass2898 or QuestHandoverOperationClass) { base.Execute(operation, callback); return; diff --git a/Fika.Core/Coop/ClientClasses/CoopSharedQuestController.cs b/Fika.Core/Coop/ClientClasses/CoopSharedQuestController.cs index eedc47a8..dcdbec67 100644 --- a/Fika.Core/Coop/ClientClasses/CoopSharedQuestController.cs +++ b/Fika.Core/Coop/ClientClasses/CoopSharedQuestController.cs @@ -8,7 +8,7 @@ namespace Fika.Core.Coop.ClientClasses { public sealed class CoopSharedQuestController(Profile profile, InventoryControllerClass inventoryController, - GInterface161 session, CoopPlayer player, bool fromServer = true) : GClass3229(profile, inventoryController, session, fromServer) + IQuestActions session, CoopPlayer player, bool fromServer = true) : GClass3229(profile, inventoryController, session, fromServer) { private readonly CoopPlayer player = player; private readonly List lastFromNetwork = []; diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs index 70907d11..6b6b7b3e 100644 --- a/Fika.Core/Coop/GameMode/CoopGame.cs +++ b/Fika.Core/Coop/GameMode/CoopGame.cs @@ -105,7 +105,7 @@ public IWeatherCurve WeatherCurve private static ManualLogSource Logger; - internal static CoopGame Create(GInterface171 inputTree, Profile profile, GameDateTime backendDateTime, + internal static CoopGame Create(IInputTree inputTree, Profile profile, GameDateTime backendDateTime, InsuranceCompanyClass insurance, MenuUI menuUI, GameUI gameUI, LocationSettingsClass.Location location, TimeAndWeatherSettings timeAndWeather, WavesSettings wavesSettings, EDateTime dateTime, Callback callback, float fixedDeltaTime, EUpdateQueue updateQueue, diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs index 49368038..78f954e2 100644 --- a/Fika.Core/Coop/Players/CoopPlayer.cs +++ b/Fika.Core/Coop/Players/CoopPlayer.cs @@ -296,7 +296,7 @@ public override void Proceed(MedsClass meds, EBodyPart bodyPart, Callback callback, bool scheduled = true) + public override void Proceed(GrenadeClass throwWeap, Callback callback, bool scheduled = true) { QuickGrenadeControllerHandler handler = new(this, throwWeap); @@ -1054,7 +1054,7 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet) // Unknown what problems this might cause so far. if (result.Value is GClass2878 unloadOperation) { - if (unloadOperation.InternalOperation is GClass2889 internalSplitOperation) + if (unloadOperation.InternalOperation is SplitOperationClass internalSplitOperation) { Item item = internalSplitOperation.To.Item; if (item != null) @@ -1076,7 +1076,7 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet) } // TODO: Same as above. - if (result.Value is GClass2889 splitOperation) + if (result.Value is SplitOperationClass splitOperation) { Item item = splitOperation.To.Item; if (item != null) @@ -1746,7 +1746,7 @@ private class QuickGrenadeControllerHandler(CoopPlayer coopPlayer, GrenadeClass { private readonly CoopPlayer coopPlayer = coopPlayer; private readonly GrenadeClass throwWeap = throwWeap; - public Process process; + public Process process; public Action confirmCallback; internal CoopClientQuickGrenadeController ReturnController() diff --git a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs index ad53658e..67fce72d 100644 --- a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs +++ b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs @@ -556,11 +556,11 @@ public override void Proceed(GrenadeClass throwWeap, Callback(this, func, throwWeap, false).method_0(null, callback, scheduled); } - public override void Proceed(GrenadeClass throwWeap, Callback callback, bool scheduled = true) + public override void Proceed(GrenadeClass throwWeap, Callback callback, bool scheduled = true) { HandsControllerFactory factory = new(this, throwWeap); Func func = new(factory.CreateObservedQuickGrenadeController); - new Process(this, func, throwWeap, false).method_0(null, callback, scheduled); + new Process(this, func, throwWeap, false).method_0(null, callback, scheduled); } public override void Proceed(Weapon weapon, Callback callback, bool scheduled = true) diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs index 5d8aab9d..6133d8c5 100644 --- a/Fika.Core/Networking/FikaServer.cs +++ b/Fika.Core/Networking/FikaServer.cs @@ -567,7 +567,7 @@ private void OnInventoryPacketReceived(InventoryPacket packet, NetPeer peer) // Unknown what problems this might cause so far. if (result.Value is GClass2878 unloadOperation) { - if (unloadOperation.InternalOperation is GClass2889 internalSplitOperation) + if (unloadOperation.InternalOperation is SplitOperationClass internalSplitOperation) { Item item = internalSplitOperation.To.Item; if (item != null) @@ -589,7 +589,7 @@ private void OnInventoryPacketReceived(InventoryPacket packet, NetPeer peer) } // TODO: Same as above. - if (result.Value is GClass2889 splitOperation) + if (result.Value is SplitOperationClass splitOperation) { Item item = splitOperation.To.Item; if (item != null) diff --git a/References/hollowed.dll b/References/hollowed.dll index 4d938e1f..ee9c60bb 100644 Binary files a/References/hollowed.dll and b/References/hollowed.dll differ