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

@@ -247,7 +247,10 @@ namespace Content.Client
/// </summary> /// </summary>
public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs) public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs)
{ {
eventArgs.OldEntity.RemoveComponent<CharacterInterface>(); if (!eventArgs.OldEntity.Deleted)
{
eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
}
} }
public override void PostInit() public override void PostInit()