tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-06-01 09:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug when pasting ini config into paste window, resulting in blank record.

Browse source
This commit is contained in:
Brett Hewitson 2022-01-20 17:31:23 +10:00
parent d5800f21ec
commit a029d2dd51
6 changed files with 77 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
View file

@ -3507,7 +3507,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(dinoSetting.ReplacementClass)) if (string.IsNullOrWhiteSpace(dinoSetting.ReplacementClass))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(dinoSetting.ReplacementClass, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(dinoSetting.ReplacementClass)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3524,7 +3524,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(spawnEntry.NPCClassString)) if (string.IsNullOrWhiteSpace(spawnEntry.NPCClassString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(spawnEntry.NPCClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(spawnEntry.NPCClassString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3540,7 +3540,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(preventTransfer.DinoClassString)) if (string.IsNullOrWhiteSpace(preventTransfer.DinoClassString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(preventTransfer.DinoClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(preventTransfer.DinoClassString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3586,7 +3586,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(spawnSetting.NPCSpawnEntriesContainerClassString)) if (string.IsNullOrWhiteSpace(spawnSetting.NPCSpawnEntriesContainerClassString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(spawnSetting.NPCSpawnEntriesContainerClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(spawnSetting.NPCSpawnEntriesContainerClassString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3628,7 +3628,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(craftingItem.ItemClassString)) if (string.IsNullOrWhiteSpace(craftingItem.ItemClassString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(craftingItem.ItemClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(craftingItem.ItemClassString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3642,7 +3642,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(craftingResource.ResourceItemTypeString)) if (string.IsNullOrWhiteSpace(craftingResource.ResourceItemTypeString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(craftingResource.ResourceItemTypeString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(craftingResource.ResourceItemTypeString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3664,7 +3664,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(itemClass.ItemClassString)) if (string.IsNullOrWhiteSpace(itemClass.ItemClassString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(itemClass.ItemClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(itemClass.ItemClassString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3682,7 +3682,7 @@ namespace ServerManagerTool
if (string.IsNullOrWhiteSpace(stackSize.ItemClassString)) if (string.IsNullOrWhiteSpace(stackSize.ItemClassString))
continue; continue;
if (!newList.Any(s => s.ValueMember.Equals(stackSize.ItemClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(stackSize.ItemClassString)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3727,7 +3727,7 @@ namespace ServerManagerTool
foreach (var supplyCrate in this.Settings.ConfigOverrideSupplyCrateItems) foreach (var supplyCrate in this.Settings.ConfigOverrideSupplyCrateItems)
{ {
if (!newList.Any(s => s.ValueMember.Equals(supplyCrate.SupplyCrateClassString, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(s => s.ValueMember.Equals(supplyCrate.SupplyCrateClassString)))
{ {
if (string.IsNullOrWhiteSpace(supplyCrate.SupplyCrateClassString)) if (string.IsNullOrWhiteSpace(supplyCrate.SupplyCrateClassString))
continue; continue;
@ -3775,7 +3775,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.ServerMap)) if (!string.IsNullOrWhiteSpace(this.Settings.ServerMap))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.ServerMap, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.ServerMap)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3812,7 +3812,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.TotalConversionModId)) if (!string.IsNullOrWhiteSpace(this.Settings.TotalConversionModId))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.TotalConversionModId, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.TotalConversionModId)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3849,7 +3849,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.BranchName)) if (!string.IsNullOrWhiteSpace(this.Settings.BranchName))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.BranchName, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.BranchName)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -3886,7 +3886,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.EventName)) if (!string.IsNullOrWhiteSpace(this.Settings.EventName))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.EventName, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.EventName)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {

9
src/ARKServerManager/VersionFeed.xml
View file

@ -5,14 +5,14 @@
<title>Ark Server Manager Version Feed</title> <title>Ark Server Manager Version Feed</title>
<subtitle>This is the Ark Server Manager release version feed.</subtitle> <subtitle>This is the Ark Server Manager release version feed.</subtitle>
<link href="http://arkservermanager.freeforums.net/" /> <link href="http://arkservermanager.freeforums.net/" />
<updated>2022-01-19T00:00:00Z</updated> <updated>2022-01-20T00:00:00Z</updated>
<entry> <entry>
<id>urn:uuid:9B66118D-DDFE-4E72-9CB9-299642AD29FF</id> <id>urn:uuid:9B66118D-DDFE-4E72-9CB9-299642AD29FF</id>
<title>1.1.416 (1.1.416.5)</title> <title>1.1.416 (1.1.416.6)</title>
<summary>1.1.416.5</summary> <summary>1.1.416.6</summary>
<link href="" /> <link href="" />
<updated>2022-01-19T00:00:00Z</updated> <updated>2022-01-20T00:00:00Z</updated>
<content type="xhtml"> <content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;"> <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p> <p>
@ -20,6 +20,7 @@
<br/> <br/>
<ul> <ul>
<li>Fixed player and dino level import bug.</li> <li>Fixed player and dino level import bug.</li>
<li>Fixed bug when pasting ini config into paste window, resulting in blank record.</li>
</ul> </ul>
<u style="font-size: .9em;">CHANGE</u> <u style="font-size: .9em;">CHANGE</u>
<br/> <br/>

25
src/ARKServerManager/VersionFeedBeta.xml
View file

@ -5,7 +5,30 @@
<title>Ark Server Manager Version Feed</title> <title>Ark Server Manager Version Feed</title>
<subtitle>This is the Ark Server Manager beta version feed.</subtitle> <subtitle>This is the Ark Server Manager beta version feed.</subtitle>
<link href="http://arkservermanager.freeforums.net/" /> <link href="http://arkservermanager.freeforums.net/" />
<updated>2022-01-19T00:00:00Z</updated> <updated>2022-01-20T00:00:00Z</updated>
<entry>
<id>urn:uuid:A14B2CF5-071F-41F6-BA00-FA1F08FFA774</id>
<title>1.1.416 (1.1.416.6)</title>
<summary>1.1.416.6</summary>
<link href="" />
<updated>2022-01-20T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Fixed bug when pasting ini config into paste window, resulting in blank record.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry> <entry>
<id>urn:uuid:6C7B39A6-5705-48D7-815A-E5CA5721C61F</id> <id>urn:uuid:6C7B39A6-5705-48D7-815A-E5CA5721C61F</id>

6
src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
View file

@ -1212,7 +1212,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.ServerMap)) if (!string.IsNullOrWhiteSpace(this.Settings.ServerMap))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.ServerMap, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.ServerMap)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -1240,7 +1240,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.BranchName)) if (!string.IsNullOrWhiteSpace(this.Settings.BranchName))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.BranchName, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.BranchName)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {
@ -1283,7 +1283,7 @@ namespace ServerManagerTool
if (!string.IsNullOrWhiteSpace(this.Settings.ServerRegion)) if (!string.IsNullOrWhiteSpace(this.Settings.ServerRegion))
{ {
if (!newList.Any(m => m.ValueMember.Equals(this.Settings.ServerRegion, StringComparison.OrdinalIgnoreCase))) if (!newList.Any(m => m.ValueMember.Equals(this.Settings.ServerRegion)))
{ {
newList.Add(new Common.Model.ComboBoxItem newList.Add(new Common.Model.ComboBoxItem
{ {

11
src/ConanServerManager/VersionFeed.xml
View file

@ -9,13 +9,18 @@
<entry> <entry>
<id>urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE</id> <id>urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE</id>
<title>1.1.61 (1.1.61.3)</title> <title>1.1.61 (1.1.61.4)</title>
<summary>1.1.61.3</summary> <summary>1.1.61.4</summary>
<link href="" /> <link href="" />
<updated>2022-01-14T00:00:00Z</updated> <updated>2022-01-20T00:00:00Z</updated>
<content type="xhtml"> <content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;"> <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p> <p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Fixed bug when pasting ini config into paste window, resulting in blank record.</li>
</ul>
<u style="font-size: .9em;">CHANGE</u> <u style="font-size: .9em;">CHANGE</u>
<br/> <br/>
<ul> <ul>

25
src/ConanServerManager/VersionFeedBeta.xml
View file

@ -5,7 +5,30 @@
<title>Conan Server Manager Version Feed</title> <title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager beta version feed.</subtitle> <subtitle>This is the Conan Server Manager beta version feed.</subtitle>
<link href="http://servermanagers.freeforums.net/" /> <link href="http://servermanagers.freeforums.net/" />
<updated>2022-01-14T00:00:00Z</updated> <updated>2022-01-20T00:00:00Z</updated>
<entry>
<id>urn:uuid:1BA6E671-7784-48FF-B463-D0962084277B</id>
<title>1.1.61 (1.1.61.4)</title>
<summary>1.1.61.4</summary>
<link href="" />
<updated>2022-01-20T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Fixed bug when pasting ini config into paste window, resulting in blank record.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry> <entry>
<id>urn:uuid:BF3FA549-5DC9-4576-B225-6D8519ED3B98</id> <id>urn:uuid:BF3FA549-5DC9-4576-B225-6D8519ED3B98</id>