From 4b1fd4cfd171a43da839ebddd08c3e87b25230c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Sat, 29 Feb 2020 16:09:03 +0100 Subject: [PATCH] Don't unvisit before transferring mind (#760) --- Content.Server/Administration/ControlMob.cs | 3 --- Content.Server/GlobalVerbs/ControlMobVerb.cs | 3 --- 2 files changed, 6 deletions(-) diff --git a/Content.Server/Administration/ControlMob.cs b/Content.Server/Administration/ControlMob.cs index ed170cac3f..4a72b5dd89 100644 --- a/Content.Server/Administration/ControlMob.cs +++ b/Content.Server/Administration/ControlMob.cs @@ -55,9 +55,6 @@ namespace Content.Server.Administration return; } - if(mind.IsVisitingEntity) - mind.UnVisit(); - mindComponent.Mind?.TransferTo(null); mind.TransferTo(target); diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/GlobalVerbs/ControlMobVerb.cs index c9892beba5..d67391c202 100644 --- a/Content.Server/GlobalVerbs/ControlMobVerb.cs +++ b/Content.Server/GlobalVerbs/ControlMobVerb.cs @@ -40,9 +40,6 @@ namespace Content.Server.GlobalVerbs var userMind = user.GetComponent().playerSession.ContentData().Mind; var targetMind = target.GetComponent(); - if(userMind.IsVisitingEntity) - userMind.UnVisit(); - targetMind.Mind?.TransferTo(null); userMind.TransferTo(target); }