-try-catch blocks for GUIComponents fixedChildren lists
-player name and IP address in debug messages -crash logs now output up to 15 messages
This commit is contained in:
@@ -29,10 +29,18 @@ namespace Barotrauma
|
|||||||
if (ComponentsToUpdate.Contains(this)) return;
|
if (ComponentsToUpdate.Contains(this)) return;
|
||||||
ComponentsToUpdate.Add(this);
|
ComponentsToUpdate.Add(this);
|
||||||
|
|
||||||
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
|
try
|
||||||
foreach (GUIComponent c in fixedChildren)
|
|
||||||
{
|
{
|
||||||
c.AddToGUIUpdateList();
|
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
|
||||||
|
foreach (GUIComponent c in fixedChildren)
|
||||||
|
{
|
||||||
|
c.AddToGUIUpdateList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
DebugConsole.NewMessage("Error in AddToGUIUPdateList! GUIComponent runtime type: "+this.GetType().ToString()+"; children count: "+children.Count.ToString(),Color.Red);
|
||||||
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -372,13 +380,21 @@ namespace Barotrauma
|
|||||||
|
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
//use a fixed list since children can change their order in the main children list
|
try
|
||||||
//TODO: maybe find a more efficient way of handling changes in list order
|
|
||||||
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
|
|
||||||
foreach (GUIComponent c in fixedChildren)
|
|
||||||
{
|
{
|
||||||
if (!c.Visible) continue;
|
//use a fixed list since children can change their order in the main children list
|
||||||
c.Update(deltaTime);
|
//TODO: maybe find a more efficient way of handling changes in list order
|
||||||
|
List<GUIComponent> fixedChildren = new List<GUIComponent>(children);
|
||||||
|
foreach (GUIComponent c in fixedChildren)
|
||||||
|
{
|
||||||
|
if (!c.Visible) continue;
|
||||||
|
c.Update(deltaTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
DebugConsole.NewMessage("Error in Update! GUIComponent runtime type: " + this.GetType().ToString() + "; children count: " + children.Count.ToString(), Color.Red);
|
||||||
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -86,9 +86,7 @@ namespace Barotrauma.Networking
|
|||||||
inc.SenderConnection.Disconnect("Server full");
|
inc.SenderConnection.Disconnect("Server full");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
DebugConsole.NewMessage("New player has joined the server", Color.White);
|
|
||||||
|
|
||||||
byte userID;
|
byte userID;
|
||||||
string version = "", packageName = "", packageHash = "", name = "";
|
string version = "", packageName = "", packageHash = "", name = "";
|
||||||
try
|
try
|
||||||
@@ -106,6 +104,8 @@ namespace Barotrauma.Networking
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DebugConsole.NewMessage("New player has joined the server (" + name + ", " + inc.SenderConnection.RemoteEndPoint.Address.ToString() + ")", Color.White);
|
||||||
|
|
||||||
#if !DEBUG
|
#if !DEBUG
|
||||||
if (string.IsNullOrWhiteSpace(name))
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ namespace Barotrauma
|
|||||||
sb.AppendLine("\n");
|
sb.AppendLine("\n");
|
||||||
|
|
||||||
sb.AppendLine("Last debug messages:");
|
sb.AppendLine("Last debug messages:");
|
||||||
for (int i = DebugConsole.Messages.Count - 1; i > 0 && i > DebugConsole.Messages.Count - 10; i-- )
|
for (int i = DebugConsole.Messages.Count - 1; i > 0 && i > DebugConsole.Messages.Count - 15; i-- )
|
||||||
{
|
{
|
||||||
sb.AppendLine(" "+DebugConsole.Messages[i].Time+" - "+DebugConsole.Messages[i].Text);
|
sb.AppendLine(" "+DebugConsole.Messages[i].Time+" - "+DebugConsole.Messages[i].Text);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user