Skip to content

Commit 5ee631e

Browse files
authored
Merge pull request #33 from UncomplicatedCustomServer/Exiled-Dev
Fixed Update for EXILED
2 parents a7ccc89 + e32b68b commit 5ee631e

1 file changed

Lines changed: 6 additions & 26 deletions

File tree

  • UncomplicatedCustomItems/Commands/Admin

UncomplicatedCustomItems/Commands/Admin/Update.cs

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class GitHubAssetInfo
2323
[CommandHandler(typeof(GameConsoleCommandHandler))]
2424
public class Update : ParentCommand
2525
{
26-
private const string PluginDllName = "UncomplicatedCustomItems-LabApi.dll";
26+
private const string PluginDllName = "UncomplicatedCustomItems-Exiled.dll";
2727

2828
public Update() => LoadGeneratedCommands();
2929

@@ -100,8 +100,6 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
100100
}
101101

102102
string pluginPath = string.Empty;
103-
ushort serverPort = 0;
104-
serverPort = Server.Port;
105103

106104
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
107105
{
@@ -112,23 +110,14 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
112110
LogManager.Error("Could not determine user home directory for Linux path.");
113111
else
114112
{
115-
string portSpecificLinuxPath = Path.Combine(homeDirectory, ".config", "SCP Secret Laboratory", "LabAPI", "plugins", serverPort.ToString(), PluginDllName);
113+
string portSpecificLinuxPath = Path.Combine(homeDirectory, ".config", "EXILED", "Plugins", PluginDllName);
116114
if (File.Exists(portSpecificLinuxPath))
117115
pluginPath = portSpecificLinuxPath;
118-
else
119-
{
120-
LogManager.Warn($"Linux LabAPI Port-Specific plugin path not found: {portSpecificLinuxPath}. Trying global LabAPI path.");
121-
string globalLinuxPath = Path.Combine(homeDirectory, ".config", "SCP Secret Laboratory", "LabAPI", "plugins", PluginDllName);
122-
if (File.Exists(globalLinuxPath))
123-
pluginPath = globalLinuxPath;
124-
else
125-
LogManager.Warn($"Linux LabAPI Global plugin path not found: {globalLinuxPath}");
126-
}
127116
}
128117
}
129118
catch (Exception ex)
130119
{
131-
LogManager.Error($"Error determining Linux LabAPI plugin paths: {ex.Message}");
120+
LogManager.Error($"Error determining Linux Exiled plugin paths: {ex.Message}");
132121
}
133122
}
134123
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -140,29 +129,20 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
140129
LogManager.Error("Could not determine AppData directory for Windows path.");
141130
else
142131
{
143-
string portSpecificWindowsPath = Path.Combine(appDataDirectory, "SCP Secret Laboratory", "LabAPI", "plugins", serverPort.ToString(), PluginDllName);
132+
string portSpecificWindowsPath = Path.Combine(appDataDirectory, "EXILED", "Plugins", PluginDllName);
144133
if (File.Exists(portSpecificWindowsPath))
145134
pluginPath = portSpecificWindowsPath;
146-
else
147-
{
148-
LogManager.Warn($"Windows LabAPI Port-Specific plugin path not found: {portSpecificWindowsPath}. Trying global LabAPI path.");
149-
string globalWindowsPath = Path.Combine(appDataDirectory, "SCP Secret Laboratory", "LabAPI", "plugins", PluginDllName);
150-
if (File.Exists(globalWindowsPath))
151-
pluginPath = globalWindowsPath;
152-
else
153-
LogManager.Warn($"Windows LabAPI Global plugin path not found: {globalWindowsPath}");
154-
}
155135
}
156136
}
157137
catch (Exception ex)
158138
{
159-
LogManager.Error($"Error determining Windows LabAPI plugin paths: {ex.Message}");
139+
LogManager.Error($"Error determining Windows Exiled plugin paths: {ex.Message}");
160140
}
161141
}
162142

163143
if (string.IsNullOrEmpty(pluginPath))
164144
{
165-
LogManager.Error("Could not determine the path of the current plugin DLL using LabAPI paths. Update aborted.");
145+
LogManager.Error("Could not determine the path of the current plugin DLL using Exiled paths. Update aborted.");
166146
return;
167147
}
168148

0 commit comments

Comments
 (0)