From 3ebdbde33d5d885cb99f05f2e41b4c4e4e2c7276 Mon Sep 17 00:00:00 2001
From: RaidMax <raidmax@live.com>
Date: Wed, 3 Nov 2021 18:51:52 -0500
Subject: [PATCH] fix issue with assigning correct server when processing
 command

---
 SharedLibraryCore/Commands/CommandProcessing.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SharedLibraryCore/Commands/CommandProcessing.cs b/SharedLibraryCore/Commands/CommandProcessing.cs
index 2d2dbedd3..a85ad282b 100644
--- a/SharedLibraryCore/Commands/CommandProcessing.cs
+++ b/SharedLibraryCore/Commands/CommandProcessing.cs
@@ -85,8 +85,8 @@ namespace SharedLibraryCore.Commands
                         {
                             found = Manager.FindActiveClient(found);
                             E.Target = found;
-                            E.Target.CurrentServer = E.Owner;
-                            E.Data = String.Join(" ", Args.Skip(1));
+                            E.Target.CurrentServer = found.CurrentServer ?? E.Owner;
+                            E.Data = string.Join(" ", Args.Skip(1));
                         }
                     }