Skip to content

Always add rcon arguments, not just for windows #132

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.

Sign up for GitHub

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

Merged
grilledham merged 1 commit into from
Nov 10, 2024
Merged

Always add rcon arguments, not just for windows #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions FactorioWrapper/MainLoop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ public class MainLoop : IDisposable
private readonly Settings settings;
private readonly string serverId;
private readonly string factorioFileName;

#if WINDOWS
private string factorioArguments;
#else
private readonly string factorioArguments;
#endif

// This is to stop multiple threads writing to the factorio process concurrently.
private readonly SemaphoreSlim factorioProcessLock = new SemaphoreSlim(1, 1);
Expand All @@ -48,7 +43,6 @@ public class MainLoop : IDisposable
private volatile FactorioServerStatus status = FactorioServerStatus.WrapperStarting;
private readonly SingleConsumerQueue<Func<Task>> messageQueue;

#if WINDOWS
private volatile RconMessenger rcon;
private int rconPort;
private const string rconPassword = "no_one_will_guess_this_awesome_password.";
Expand Down Expand Up @@ -86,7 +80,6 @@ private async Task ConnectRCON()
factorioProcessLock.Release();
}
}
#endif

public MainLoop(Settings settings, string serverId, string factorioFileName, string factorioArguments)
{
Expand All @@ -95,9 +88,7 @@ public MainLoop(Settings settings, string serverId, string factorioFileName, str
this.factorioFileName = factorioFileName;
this.factorioArguments = factorioArguments;

#if WINDOWS
PrependRconArguments();
#endif

messageQueue = new SingleConsumerQueue<Func<Task>>(maxMessageQueueSize, async func =>
{
Expand Down
Loading