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

Null reference fixes

Browse Source
This commit is contained in:
Regalis
2017-05-29 18:41:56 +03:00
parent 52daeea109
commit 9281795866
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Character.cs
+1 -1
View File
@@ -1294,7 +1294,7 @@ namespace Barotrauma
(c2.IsRemotePlayer || c2 == GameMain.Server.Character) && (c2.IsRemotePlayer || c2 == GameMain.Server.Character) &&
Vector2.Distance(c2.WorldPosition, c.WorldPosition) < NetConfig.CharacterIgnoreDistance); Vector2.Distance(c2.WorldPosition, c.WorldPosition) < NetConfig.CharacterIgnoreDistance);
} }
else else if (Submarine.MainSub != null)
{ {
//disable AI characters that are far away from the sub and the controlled character //disable AI characters that are far away from the sub and the controlled character
c.Enabled = Vector2.Distance(Submarine.MainSub.WorldPosition, c.WorldPosition) < NetConfig.CharacterIgnoreDistance || c.Enabled = Vector2.Distance(Submarine.MainSub.WorldPosition, c.WorldPosition) < NetConfig.CharacterIgnoreDistance ||
Subsurface/Source/Map/Explosion.cs
+1 -1
View File
@@ -93,7 +93,7 @@ namespace Barotrauma
item.ApplyStatusEffects(ActionType.OnFire, 1.0f); item.ApplyStatusEffects(ActionType.OnFire, 1.0f);
if (item.Condition <= 0.0f) if (item.Condition <= 0.0f && GameMain.Server != null)
{ {
GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnFire }); GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnFire });
} }
Subsurface/Source/Map/FireSource.cs
+1 -1
View File
@@ -280,7 +280,7 @@ namespace Barotrauma
if (item.Position.Y < position.Y - size.Y || item.Position.Y > hull.Rect.Y) continue; if (item.Position.Y < position.Y - size.Y || item.Position.Y > hull.Rect.Y) continue;
item.ApplyStatusEffects(ActionType.OnFire, deltaTime); item.ApplyStatusEffects(ActionType.OnFire, deltaTime);
if (item.Condition <= 0.0f) if (item.Condition <= 0.0f && GameMain.Server != null)
{ {
GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnFire }); GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnFire });
} }
Subsurface/Source/Map/MapEntity.cs
+2 -2
View File
@@ -382,8 +382,8 @@ namespace Barotrauma
{ {
item.Update(cam, deltaTime); item.Update(cam, deltaTime);
} }
Entity.Spawner.Update(); Spawner?.Update();
} }
public virtual void Update(Camera cam, float deltaTime) { } public virtual void Update(Camera cam, float deltaTime) { }