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

Workaround to null reference exceptions in Character.WriteStatus: it seems AnimController can be null when reading the message, which suggests that the character has been removed (e.g. turned to a husk, eaten by something).

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-26 21:35:50 +03:00
parent 61b90464dd
commit affb43e7a5
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
View File

@@ -21,11 +21,18 @@ namespace Barotrauma
{
get
{
return enabled;
return enabled && !Removed;
}
set
{
if (value == enabled) return;
if (Removed)
{
enabled = false;
return;
}
enabled = value;
foreach (Limb limb in AnimController.Limbs)
@@ -980,7 +987,7 @@ namespace Barotrauma
public bool CanInteractWith(Character c, float maxDist = 200.0f)
{
if (c == this || !c.enabled || c.info == null || !c.IsHumanoid || !c.CanBeSelected) return false;
if (c == this || !c.Enabled || c.info == null || !c.IsHumanoid || !c.CanBeSelected) return false;
maxDist = ConvertUnits.ToSimUnits(maxDist);
if (Vector2.DistanceSquared(SimPosition, c.SimPosition) > maxDist * maxDist) return false;

27
Barotrauma/BarotraumaShared/Source/Characters/CharacterNetworking.cs
View File

@@ -474,18 +474,27 @@ namespace Barotrauma
if (isDead)
{
msg.Write((byte)causeOfDeath);
List<int> severedJointIndices = new List<int>();
for (int i = 0; i < AnimController.LimbJoints.Length; i++)
if (AnimController?.LimbJoints == null)
{
if (AnimController.LimbJoints[i] != null && AnimController.LimbJoints[i].IsSevered)
{
severedJointIndices.Add(i);
}
//0 limbs severed
msg.Write((byte)0);
}
msg.Write((byte)severedJointIndices.Count);
foreach (int jointIndex in severedJointIndices)
else
{
msg.Write((byte)jointIndex);
List<int> severedJointIndices = new List<int>();
for (int i = 0; i < AnimController.LimbJoints.Length; i++)
{
if (AnimController.LimbJoints[i] != null && AnimController.LimbJoints[i].IsSevered)
{
severedJointIndices.Add(i);
}
}
msg.Write((byte)severedJointIndices.Count);
foreach (int jointIndex in severedJointIndices)
{
msg.Write((byte)jointIndex);
}
}
}
else