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

Fixed a null exception when a dragged character is removed

Browse Source
This commit is contained in:
Regalis
2017-05-25 17:05:28 +03:00
parent 6223861f7a
commit 44349b97b0
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/Ragdoll.cs
+2 -2
View File
@@ -1256,7 +1256,7 @@ namespace Barotrauma
//use simple interpolation for other players' characters and characters that can't move
if (character.MemState.Count > 0)
{
if (character.MemState[0].Interact == null)
if (character.MemState[0].Interact == null || character.MemState[0].Interact.Removed)
{
character.DeselectCharacter();
character.SelectedConstruction = null;
@@ -1348,7 +1348,7 @@ namespace Barotrauma
//the entity we're interacting with doesn't match the server's
if (localPos.Interact != serverPos.Interact)
{
if (serverPos.Interact == null)
if (serverPos.Interact == null || serverPos.Interact.Removed)
{
character.DeselectCharacter();
character.SelectedConstruction = null;