(5a377a8ee) Unstable v0.9.1000.0

This commit is contained in:
Juan Pablo Arce
2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using Barotrauma.IO;
using System.Linq;
using System.Reflection;
using System.Security.Cryptography;
@@ -325,15 +325,12 @@ namespace Barotrauma
{
try
{
using (StreamReader file = new StreamReader(filePath))
lines = File.ReadAllLines(filePath).ToList();
cachedLines.Add(filePath, lines);
if (lines.Count == 0)
{
lines = File.ReadLines(filePath).ToList();
cachedLines.Add(filePath, lines);
if (lines.Count == 0)
{
DebugConsole.ThrowError("File \"" + filePath + "\" is empty!");
return "";
}
DebugConsole.ThrowError("File \"" + filePath + "\" is empty!");
return "";
}
}
catch (Exception e)