Merge branch 'master' into 20-06-24-movement-prediction

This commit is contained in:
Pieter-Jan Briers
2020-06-24 12:12:03 +02:00

View File

@@ -246,9 +246,12 @@ namespace Content.Client
/// Remove the character interface master from this entity now that we have detached ourselves from it /// Remove the character interface master from this entity now that we have detached ourselves from it
/// </summary> /// </summary>
public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs) public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs)
{
if (!eventArgs.OldEntity.Deleted)
{ {
eventArgs.OldEntity.RemoveComponent<CharacterInterface>(); eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
} }
}
public override void PostInit() public override void PostInit()
{ {