tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings and code cleanup/fixes (#13570)

Browse Source
This commit is contained in:
Visne
2023-01-19 03:56:45 +01:00
committed by GitHub
parent 3ca5a0224b
commit c6d3e4f3bd
265 changed files with 499 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Tools/YamlTools.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Tools
if (ignoreThese.Contains(kvp.Key.ToString()))
continue;
var localPath = path + "/" + kvp.Key.ToString();
var localPath = path + "/" + kvp.Key;
var deletedByOurs = !ours.Children.ContainsKey(kvp.Key);
var deletedByOther = !other.Children.ContainsKey(kvp.Key);
if (deletedByOther && (!deletedByOurs))
@@ -123,7 +123,7 @@ namespace Content.Tools
if (ignoreThese.Contains(kvp.Key.ToString()))
continue;
var localPath = path + "/" + kvp.Key.ToString();
var localPath = path + "/" + kvp.Key;
if (!based.Children.ContainsKey(kvp.Key))
{
if (ours.Children.ContainsKey(kvp.Key))