From 81b414c95ee5abbff14f1b4cb76a899110e59d7a Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 29 Aug 2018 14:43:48 -0400 Subject: [PATCH] Core/Commands: No need for dupe the method. --- Source/Game/Chat/CommandHandler.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Game/Chat/CommandHandler.cs b/Source/Game/Chat/CommandHandler.cs index 45b8601d8..c2ceae1ce 100644 --- a/Source/Game/Chat/CommandHandler.cs +++ b/Source/Game/Chat/CommandHandler.cs @@ -555,12 +555,11 @@ namespace Game.Chat if (_session == null) return null; - ObjectGuid selected = _session.GetPlayer().GetTarget(); + Unit selected = _session.GetPlayer().GetSelectedUnit(); + if (selected) + return selected; - if (selected.IsEmpty()) - return _session.GetPlayer(); - - return Global.ObjAccessor.GetUnit(_session.GetPlayer(), selected); + return _session.GetPlayer(); } public WorldObject GetSelectedObject() {