From bdc6e000f1fa1462ce0cbcdb9852b3c17bfc6625 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Sun, 8 Jan 2017 03:58:41 +0100 Subject: [PATCH] Fixed not being able to /qatool recover characters with a surname --- .../commands/callbacks/QaToolCmdCallback.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/resources/commands/callbacks/QaToolCmdCallback.java index ad7f4925b..d4b88713e 100644 --- a/src/resources/commands/callbacks/QaToolCmdCallback.java +++ b/src/resources/commands/callbacks/QaToolCmdCallback.java @@ -203,18 +203,14 @@ public class QaToolCmdCallback implements ICmdCallback { } private void recoverPlayer(ObjectManager objManager, PlayerManager playerManager, Player player, String name, String loc) { - long id = playerManager.getCharacterIdByName(name); - if (id == 0) { - sendSystemMessage(player, "Could not find player by name: '" + name + "'"); - return; - } - SWGObject recoveree = objManager.getObjectById(id); + Player recoveree = playerManager.getPlayerByCreatureFirstName(name); + if (recoveree == null) { - sendSystemMessage(player, "Could not find player by name: " + name); - sendSystemMessage(player, "Internal Error. Recoveree is null! ID: " + id); + sendSystemMessage(player, "Could not find player by first name: '" + name + "'"); return; } - sendSystemMessage(player, teleportToRecoveryLocation(objManager, recoveree, loc)); + + sendSystemMessage(player, teleportToRecoveryLocation(objManager, recoveree.getCreatureObject(), loc)); } private String teleportToRecoveryLocation(ObjectManager objManager, SWGObject obj, String loc) {