Skip to content

Commit

Permalink
fix Conflict from Merge branch 'dev' into pr/89
Browse files Browse the repository at this point in the history
  • Loading branch information
louis1706 committed Dec 26, 2024
1 parent 3a62aac commit 22097e7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion EXILED/Exiled.Loader/Loader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ private static void LoadPluginsFromDirectory(string dir = null)

AssemblyInformationalVersionAttribute attribute = plugin.Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();

Log.Info($"Loaded plugin {plugin.Name}@{(plugin.Version != null ? $"{plugin.Version}" : attribute != null ? attribute.InformationalVersion : string.Empty)}");
Log.Info($"Loaded plugin {plugin.Name}@{(attribute is not null ? attribute.InformationalVersion : plugin.Version is not null ? $"{plugin.Version.Major}.{plugin.Version.Minor}.{plugin.Version.Build}" : string.Empty)}");

Server.PluginAssemblies.Add(assembly, plugin);
Plugins.Add(plugin);
Expand Down

0 comments on commit 22097e7

Please sign in to comment.