Only create shared controller when option is enabled

project-fika · Jun 18, 2024 · 8e257b8 · 8e257b8
1 parent 1011fe3
commit 8e257b8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs b/Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs
@@ -44,7 +44,7 @@ public override void Execute(GClass2854 operation, [CanBeNull] Callback callback
                 Item lootedItem = moveOperation.Item;
                 if (lootedItem.Template.QuestItem)
                 {
-                    if (CoopPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController)
+                    if (CoopPlayer.GClass3227_0 is CoopClientSharedQuestController sharedQuestController)
                     {
                         if (!sharedQuestController.CheckForTemplateId(lootedItem.TemplateId))
                         {

diff --git a/...lientClasses/CoopSharedQuestController.cs → ...lasses/CoopClientSharedQuestController.cs b/...lientClasses/CoopSharedQuestController.cs → ...lasses/CoopClientSharedQuestController.cs
@@ -8,7 +8,7 @@
 
 namespace Fika.Core.Coop.ClientClasses
 {
-    public sealed class CoopSharedQuestController(Profile profile, InventoryControllerClass inventoryController,
+    public sealed class CoopClientSharedQuestController(Profile profile, InventoryControllerClass inventoryController,
         IQuestActions session, CoopPlayer player, bool fromServer = true) : GClass3229(profile, inventoryController, session, fromServer)
     {
         private readonly CoopPlayer player = player;

diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs
@@ -67,7 +67,15 @@ public static async Task<LocalPlayer> Create(int playerId, Vector3 position, Qua
 
             ISession session = Singleton<ClientApplication<ISession>>.Instance.GetClientBackEndSession();
 
-            CoopSharedQuestController questController = new(profile, inventoryController, session, player);
+            GClass3229 questController;
+            if (FikaPlugin.QuestSharing.Value)
+            {
+                questController = new CoopClientSharedQuestController(profile, inventoryController, session, player);
+            }
+            else
+            {
+                questController = new GClass3229(profile, inventoryController, session, true);
+            }
             questController.Init();
             questController.Run();
 

diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs
@@ -128,7 +128,7 @@ private void OnQuestItemPacketReceived(QuestItemPacket packet)
         {
             if (MyPlayer.HealthController.IsAlive)
             {
-                if (MyPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController)
+                if (MyPlayer.GClass3227_0 is CoopClientSharedQuestController sharedQuestController)
                 {
                     sharedQuestController.ReceiveQuestItemPacket(ref packet);
                 }
@@ -139,7 +139,7 @@ private void OnQuestConditionPacketReceived(QuestConditionPacket packet)
         {
             if (MyPlayer.HealthController.IsAlive)
             {
-                if (MyPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController)
+                if (MyPlayer.GClass3227_0 is CoopClientSharedQuestController sharedQuestController)
                 {
                     sharedQuestController.ReceiveQuestPacket(ref packet);
                 }

diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs
@@ -199,7 +199,7 @@ private void OnQuestItemPacketReceived(QuestItemPacket packet, NetPeer peer)
 
             if (MyPlayer.HealthController.IsAlive)
             {
-                if (MyPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController)
+                if (MyPlayer.GClass3227_0 is CoopClientSharedQuestController sharedQuestController)
                 {
                     sharedQuestController.ReceiveQuestItemPacket(ref packet);
                 }
@@ -213,7 +213,7 @@ private void OnQuestConditionPacketReceived(QuestConditionPacket packet, NetPeer
 
             if (MyPlayer.HealthController.IsAlive)
             {
-                if (MyPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController)
+                if (MyPlayer.GClass3227_0 is CoopClientSharedQuestController sharedQuestController)
                 {
                     sharedQuestController.ReceiveQuestPacket(ref packet);
                 }