Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to fix set dedicated status #10

Merged
merged 6 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fika.Dedicated/Classes/DedicatedRaidWebSocketClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private void WebSocket_OnMessage(object sender, MessageEventArgs e)
return;
}

string type = jsonObject["type"].ToString();
string type = jsonObject["type"].Value<string>();

switch (type)
{
Expand Down
29 changes: 16 additions & 13 deletions Fika.Dedicated/FikaDedicatedPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class FikaDedicatedPlugin : BaseUnityPlugin
public static ManualLogSource FikaDedicatedLogger;
public static DedicatedRaidController raidController;
public static int UpdateRate { get; internal set; }
public Coroutine setDedicatedStatusRoutine;
public DedicatedStatus Status { get; set; }

private static DedicatedRaidWebSocketClient fikaDedicatedWebSocket;
private float gcCounter;
Expand Down Expand Up @@ -169,19 +169,19 @@ private IEnumerator VerifyPlayersRoutine()

private IEnumerator BeginFikaStartRaid(StartDedicatedRequest request, ISession session, RaidSettings raidSettings, LocationSettingsClass.Location location)
{
/*
* Runs through the menus. Eventually this can be replaced
* but it works for now and I was getting a CTD with other method
*/

StopCoroutine(setDedicatedStatusRoutine);
Status = DedicatedStatus.IN_RAID;

Task.Run(async () =>
{
SetDedicatedStatusRequest setDedicatedStatusRequest = new(RequestHandler.SessionId, "inraid");
SetDedicatedStatusRequest setDedicatedStatusRequest = new(RequestHandler.SessionId, DedicatedStatus.IN_RAID);
await FikaRequestHandler.SetDedicatedStatus(setDedicatedStatusRequest);
});

/*
* Runs through the menus. Eventually this can be replaced
* but it works for now and I was getting a CTD with other method
*/

MenuScreen menuScreen;
do
{
Expand Down Expand Up @@ -323,23 +323,26 @@ private IEnumerator BeginFikaStartRaid(StartDedicatedRequest request, ISession s
fikaMatchMakerScript.AcceptButton.OnClick.Invoke();
}

public IEnumerator SetDedicatedStatus()
public IEnumerator SetDedicatedStatusReady()
{
while (true)
while (Status == DedicatedStatus.READY)
{
Task.Run(async () =>
{
SetDedicatedStatusRequest setDedicatedStatusRequest = new(RequestHandler.SessionId, "ready");
SetDedicatedStatusRequest setDedicatedStatusRequest = new(RequestHandler.SessionId, DedicatedStatus.READY);
await FikaRequestHandler.SetDedicatedStatus(setDedicatedStatusRequest);
});

yield return new WaitForSeconds(15.0f);
}

yield break;
}

public void StartSetDedicatedStatusRoutine()
public void StartSetDedicatedStatusReadyRoutine()
{
setDedicatedStatusRoutine = StartCoroutine(SetDedicatedStatus());
Status = DedicatedStatus.READY;
StartCoroutine(SetDedicatedStatusReady());
}
}
}
2 changes: 1 addition & 1 deletion Fika.Dedicated/Patches/MenuScreen_Show_Patch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ protected override MethodBase GetTargetMethod()
[PatchPostfix]
static void PatchPostfix()
{
FikaDedicatedPlugin.Instance.StartSetDedicatedStatusRoutine();
FikaDedicatedPlugin.Instance.StartSetDedicatedStatusReadyRoutine();
}
}
}
Binary file modified References/Fika.Core.dll
Binary file not shown.