From d1695238f705a8993fb9be7d612d3ba0773dd8d8 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 25 Apr 2019 17:43:47 +0300 Subject: [PATCH] (ec2443ae2) Updated: EnglishVanilla with the proofreading #2 --- Barotrauma/BarotraumaClient/Source/DebugConsole.cs | 4 ---- Barotrauma/BarotraumaServer/Source/Map/Hull.cs | 3 ++- Barotrauma/BarotraumaShared/Source/Map/Hull.cs | 10 ---------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs index 486b30939..1ee8fba4d 100644 --- a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs +++ b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs @@ -394,10 +394,6 @@ namespace Barotrauma commands.Add(new Command("charactereditor|editcharacter|editcharacters|editanimation|editanimations|animedit|animationeditor|animeditor|animationedit", "charactereditor: Edit characters, animations, ragdolls....", (string[] args) => { - if (Screen.Selected == GameMain.GameScreen) - { - NewMessage("WARNING: Switching between the character editor and the game view may cause odd behaviour or bugs. Use with caution.", Color.Orange); - } GameMain.CharacterEditorScreen.Select(); })); diff --git a/Barotrauma/BarotraumaServer/Source/Map/Hull.cs b/Barotrauma/BarotraumaServer/Source/Map/Hull.cs index 3b10a7a24..3fc9ec6d3 100644 --- a/Barotrauma/BarotraumaServer/Source/Map/Hull.cs +++ b/Barotrauma/BarotraumaServer/Source/Map/Hull.cs @@ -33,7 +33,8 @@ namespace Barotrauma //update client hulls if the amount of water has changed by >10% //or if oxygen percentage has changed by 5% if (Math.Abs(lastSentVolume - waterVolume) > Volume * 0.1f || - Math.Abs(lastSentOxygen - OxygenPercentage) > 5f) + Math.Abs(lastSentOxygen - OxygenPercentage) > 5f || + FireSources.Count > 0) { sendUpdateTimer -= deltaTime; if (sendUpdateTimer < 0.0f) diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs index 4c3b594d6..23fc81dce 100644 --- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs +++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs @@ -417,11 +417,6 @@ namespace Barotrauma public void AddFireSource(FireSource fireSource) { FireSources.Add(fireSource); - - if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !IdFreed) - { - GameMain.NetworkMember.CreateEntityEvent(this); - } } public override void Update(float deltaTime, Camera cam) @@ -589,11 +584,6 @@ namespace Barotrauma public void RemoveFire(FireSource fire) { FireSources.Remove(fire); - - if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !Removed && !IdFreed) - { - GameMain.NetworkMember.CreateEntityEvent(this); - } } public IEnumerable GetConnectedHulls(int? searchDepth)