Tried to fix all errors realted to UniqueEvent and Events(Collection was modified)
This commit is contained in:
@@ -1218,7 +1218,7 @@ namespace Barotrauma.Networking
|
|||||||
|
|
||||||
errorLines.Add("");
|
errorLines.Add("");
|
||||||
errorLines.Add("EntitySpawner events:");
|
errorLines.Add("EntitySpawner events:");
|
||||||
foreach (var entityEvent in entityEventManager.UniqueEvents)
|
foreach (var entityEvent in entityEventManager.UniqueEvents.ToList())
|
||||||
{
|
{
|
||||||
if (entityEvent.Entity is EntitySpawner)
|
if (entityEvent.Entity is EntitySpawner)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -282,7 +282,7 @@ namespace Barotrauma
|
|||||||
#if SERVER
|
#if SERVER
|
||||||
if (GameMain.Server != null && Entity.Spawner != null && createNetworkEvents)
|
if (GameMain.Server != null && Entity.Spawner != null && createNetworkEvents)
|
||||||
{
|
{
|
||||||
if (GameMain.Server.EntityEventManager.UniqueEvents.Any(ev => ev.Entity == item))
|
if (GameMain.Server.EntityEventManager.UniqueEvents.ToList().Any(ev => ev.Entity == item))
|
||||||
{
|
{
|
||||||
string errorMsg = $"Error while spawning job items. Item {item.Name} created network events before the spawn event had been created.";
|
string errorMsg = $"Error while spawning job items. Item {item.Name} created network events before the spawn event had been created.";
|
||||||
DebugConsole.ThrowError(errorMsg);
|
DebugConsole.ThrowError(errorMsg);
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ namespace Barotrauma
|
|||||||
#if SERVER
|
#if SERVER
|
||||||
if (GameMain.Server != null && Entity.Spawner != null)
|
if (GameMain.Server != null && Entity.Spawner != null)
|
||||||
{
|
{
|
||||||
if (GameMain.Server.EntityEventManager.UniqueEvents.Any(ev => ev.Entity == item))
|
if (GameMain.Server.EntityEventManager.UniqueEvents.ToList().Any(ev => ev.Entity == item))
|
||||||
{
|
{
|
||||||
string errorMsg = $"Error while spawning job items. Item {item.Name} created network events before the spawn event had been created.";
|
string errorMsg = $"Error while spawning job items. Item {item.Name} created network events before the spawn event had been created.";
|
||||||
DebugConsole.ThrowError(errorMsg);
|
DebugConsole.ThrowError(errorMsg);
|
||||||
|
|||||||
Reference in New Issue
Block a user