From e501bcdf53d170c189028513fae2e2198073e948 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 21 Mar 2019 16:40:47 +0200 Subject: [PATCH] 01f115d...4fb2439 commit 4fb24391cb02f285f1adbae236647bf70d8b1e30 Author: Joonas Rikkonen Date: Thu Mar 21 16:35:18 2019 +0200 Fixed almost none of the new medical items being combinable or usable in a syringe gun, added relevant tags to StatusEffects (medical, poison) commit 975cb1c80bdf90a5b699a35f77fdddd927937816 Author: Joonas Rikkonen Date: Thu Mar 21 15:42:53 2019 +0200 Fixed spamevents command causing an immediate disconnection, fixed simulatedlatency using the first argument as both the minimum latency and random latency --- Barotrauma/BarotraumaServer/Source/DebugConsole.cs | 12 +++++++----- Barotrauma/BarotraumaShared/Source/DebugConsole.cs | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Barotrauma/BarotraumaServer/Source/DebugConsole.cs b/Barotrauma/BarotraumaServer/Source/DebugConsole.cs index 18a8733c4..a3a4c0dde 100644 --- a/Barotrauma/BarotraumaServer/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaServer/Source/DebugConsole.cs @@ -1554,9 +1554,9 @@ namespace Barotrauma })); #if DEBUG - commands.Add(new Command("spamevents", "A debug command that immediately creates entity events for all items, characters and structures.", (string[] args) => + commands.Add(new Command("spamevents", "A debug command that creates a ton of entity events.", (string[] args) => { - foreach (Item item in Item.ItemList) + /*foreach (Item item in Item.ItemList) { foreach (ItemComponent component in item.Components) { @@ -1573,16 +1573,18 @@ namespace Barotrauma GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.Status }); } } - foreach (Character c in Character.CharacterList) { GameMain.Server.CreateEntityEvent(c, new object[] { NetEntityEvent.Type.Status }); + }*/ + foreach (Hull hull in Hull.hullList) + { + GameMain.Server.CreateEntityEvent(hull); } - foreach (Structure wall in Structure.WallList) { GameMain.Server.CreateEntityEvent(wall); - } + } })); #endif } diff --git a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs index 17347cacc..3cdabed81 100644 --- a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs @@ -912,7 +912,7 @@ namespace Barotrauma ThrowError(args[0] + " is not a valid latency value."); return; } - if (!float.TryParse(args[0], NumberStyles.Any, CultureInfo.InvariantCulture, out float randomLatency)) + if (!float.TryParse(args[1], NumberStyles.Any, CultureInfo.InvariantCulture, out float randomLatency)) { ThrowError(args[1] + " is not a valid latency value."); return;