projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-10 00:13:42 -04:00
Code Issues Projects Releases Wiki Activity

Merged in M4SS/holocore/qatool_recovery (pull request #406)

Browse Source 
Fixed not being able to /qatool recover characters with a surname
This commit is contained in:
Obique PSWG
2017-01-08 00:48:31 -06:00
parent cd52b36bed bdc6e000f1
commit b04308cdbe
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/commands/callbacks/QaToolCmdCallback.java
+5 -9
View File
@@ -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) {