vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(e93fc83e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-25 17:44:24 +03:00
parent 16bebd57be
commit 501a26ef0b
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Barotrauma/BarotraumaServer/Source/Map/Hull.cs
View File

@@ -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)

10
Barotrauma/BarotraumaShared/Source/Map/Hull.cs
View File

@@ -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<Hull> GetConnectedHulls(int? searchDepth)