vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unstable v0.1100.0.4 (November 11th 2020)

Browse Source
This commit is contained in:
Joonas Rikkonen
2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Prefabs/PrefabCollection.cs
+16 -21
View File
@@ -88,35 +88,30 @@ namespace Barotrauma
DebugConsole.ThrowError($"Prefab \"{prefab.OriginalName}\" has no identifier!");
}
List<T> newList = null;
if (!prefabs.TryGetValue(prefab.Identifier, out List<T> list))
bool basePrefabExists = prefabs.TryGetValue(prefab.Identifier, out List<T> list);
//Handle bad overrides and duplicates
if (basePrefabExists && !isOverride)
{
newList = new List<T>(); newList.Add(null);
list = newList;
DebugConsole.ThrowError($"Error registering \"{prefab.OriginalName}\", \"{prefab.Identifier}\" ({typeof(T).ToString()}): base already exists; try overriding");
return;
}
if (isOverride)
//Add to list
if (!basePrefabExists)
{
/*if (list[0] == null)
{
DebugConsole.ThrowError($"Error registering \"{prefab.OriginalName}\", \"{prefab.Identifier}\" ({typeof(T).ToString()}): overriding when base doesn't exist");
return;
}*/
list.Add(prefab);
}
else
{
if (list[0] != null)
{
DebugConsole.ThrowError($"Error registering \"{prefab.OriginalName}\", \"{prefab.Identifier}\" ({typeof(T).ToString()}): base already exists; try overriding");
return;
}
list[0] = prefab;
list = new List<T>();
}
list.Add(prefab);
Sort(list);
if (newList != null) { prefabs.Add(prefab.Identifier, newList); }
if (!basePrefabExists)
{
prefabs.Add(prefab.Identifier, list);
}
}
/// <summary>