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

(7341d33ff) Fixed nullref exception if a fabricator finishes creating an item after the user has been removed.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-03 16:20:37 +03:00
parent b75db42253
commit 03f2444968
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
View File

@@ -110,7 +110,7 @@ namespace Barotrauma
{
get
{
return collider[colliderIndex];
return collider == null ? null : collider[colliderIndex];
}
}
@@ -122,10 +122,10 @@ namespace Barotrauma
}
set
{
if (value == colliderIndex) return;
if (value == colliderIndex || collider == null) return;
if (value >= collider.Count || value < 0) return;
if (collider[colliderIndex].height<collider[value].height)
if (collider[colliderIndex].height < collider[value].height)
{
Vector2 pos1 = collider[colliderIndex].SimPosition;
pos1.Y -= collider[colliderIndex].height * ColliderHeightFromFloor;

9
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
View File

@@ -210,13 +210,8 @@ namespace Barotrauma.Items.Components
{
Entity.Spawner.AddToSpawnQueue(fabricatedItem.TargetItem, outputContainer.Inventory, fabricatedItem.TargetItem.Health * fabricatedItem.OutCondition);
}
bool isNotClient = true;
#if CLIENT
isNotClient = GameMain.Client == null;
#endif
if (isNotClient && user != null)
if ((GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer) && user != null && !user.Removed)
{
foreach (Skill skill in fabricatedItem.RequiredSkills)
{