Unstable v0.15.17.0 (Hex is out of town edition)
This commit is contained in:
@@ -218,7 +218,7 @@ namespace Barotrauma
|
||||
try
|
||||
{
|
||||
#if CLIENT
|
||||
SpawnItem(args, GameMain.GameScreen.Cam.ScreenToWorld(PlayerInput.MousePosition), Character.Controlled, out string errorMsg);
|
||||
SpawnItem(args, Screen.Selected.Cam?.ScreenToWorld(PlayerInput.MousePosition) ?? PlayerInput.MousePosition, Character.Controlled, out string errorMsg);
|
||||
#elif SERVER
|
||||
SpawnItem(args, Vector2.Zero, null, out string errorMsg);
|
||||
#endif
|
||||
@@ -231,7 +231,7 @@ namespace Barotrauma
|
||||
{
|
||||
string errorMsg = "Failed to spawn an item. Arguments: \"" + string.Join(" ", args) + "\".";
|
||||
ThrowError(errorMsg, e);
|
||||
GameAnalyticsManager.AddErrorEventOnce("DebugConsole.SpawnItem:Error", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg + '\n' + e.Message + '\n' + e.StackTrace.CleanupStackTrace());
|
||||
GameAnalyticsManager.AddErrorEventOnce("DebugConsole.SpawnItem:Error", GameAnalyticsManager.ErrorSeverity.Error, errorMsg + '\n' + e.Message + '\n' + e.StackTrace.CleanupStackTrace());
|
||||
}
|
||||
},
|
||||
() =>
|
||||
@@ -239,7 +239,10 @@ namespace Barotrauma
|
||||
List<string> itemNames = new List<string>();
|
||||
foreach (ItemPrefab itemPrefab in ItemPrefab.Prefabs)
|
||||
{
|
||||
itemNames.Add(itemPrefab.Name);
|
||||
if (!itemNames.Contains(itemPrefab.Name))
|
||||
{
|
||||
itemNames.Add(itemPrefab.Name);
|
||||
}
|
||||
}
|
||||
|
||||
List<string> spawnPosParams = new List<string>() { "cursor", "inventory" };
|
||||
@@ -250,8 +253,8 @@ namespace Barotrauma
|
||||
|
||||
return new string[][]
|
||||
{
|
||||
itemNames.ToArray(),
|
||||
spawnPosParams.ToArray()
|
||||
itemNames.ToArray(),
|
||||
spawnPosParams.ToArray()
|
||||
};
|
||||
}, isCheat: true));
|
||||
|
||||
@@ -1205,7 +1208,7 @@ namespace Barotrauma
|
||||
catch (InvalidOperationException e)
|
||||
{
|
||||
string errorMsg = "Error while executing the fixhulls command.\n" + e.StackTrace.CleanupStackTrace();
|
||||
GameAnalyticsManager.AddErrorEventOnce("DebugConsole.FixHulls", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
|
||||
GameAnalyticsManager.AddErrorEventOnce("DebugConsole.FixHulls", GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
|
||||
}
|
||||
}
|
||||
}, null, true));
|
||||
@@ -1871,7 +1874,7 @@ namespace Barotrauma
|
||||
ThrowError("Failed to execute command \"" + command + "\"!");
|
||||
GameAnalyticsManager.AddErrorEventOnce(
|
||||
"DebugConsole.ExecuteCommand:LengthZero",
|
||||
GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
|
||||
GameAnalyticsManager.ErrorSeverity.Error,
|
||||
"Failed to execute command \"" + command + "\"!");
|
||||
return;
|
||||
}
|
||||
@@ -2160,7 +2163,7 @@ namespace Barotrauma
|
||||
{
|
||||
if (spawnPos != null)
|
||||
{
|
||||
if (Entity.Spawner == null)
|
||||
if (Entity.Spawner == null || Entity.Spawner.Removed)
|
||||
{
|
||||
new Item(itemPrefab, spawnPos.Value, null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user