Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp

1 files changed, 4 insertions, 5 deletions

diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 90b87796fff..dd40a590647 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -953,13 +953,12 @@ public:
         if (!player_str)
             return false;
 
-        std::string location_str = strtok(NULL, "");
-        if (location_str.empty())
-            location_str = "inn";
+        std::string location_str = "inn";
+        if (char const* loc = strtok(NULL, " "))
+            location_str = loc;
 
         Player* player = NULL;
-        std::string playerName;
-        if (!handler->extractPlayerTarget((char*)player_str, &player, NULL, &playerName))
+        if (!handler->extractPlayerTarget(player_str, &player))
             return false;
 
         if (player->isInFlight() || player->isInCombat())