@@ -15,19 +15,23 @@ public class Info : Command
1515 public void Invoke ( ShPlayer player , string targetStr )
1616 {
1717 StringBuilder sb ;
18- var target = Core . Instance . SvManager . database . Users . FindById ( targetStr ) ;
19- if ( target != null )
20- {
21- sb = GetOfflineInfo ( target ) ;
22- }
23- else if ( EntityCollections . TryGetPlayerByNameOrID ( targetStr , out ShPlayer shPlayer ) )
18+
19+ if ( EntityCollections . TryGetPlayerByNameOrID ( targetStr , out ShPlayer shPlayer ) )
2420 {
2521 sb = GetOnlineInfo ( shPlayer ) ;
2622 }
2723 else
2824 {
29- player . SendChatMessage ( $ "No account found with the id '{ targetStr } '.") ;
30- return ;
25+ var target = Core . Instance . SvManager . database . Users . FindById ( targetStr ) ;
26+ if ( target != null )
27+ {
28+ sb = GetOfflineInfo ( target ) ;
29+ }
30+ else
31+ {
32+ player . SendChatMessage ( $ "No account found with the id '{ targetStr } '.") ;
33+ return ;
34+ }
3135 }
3236 player . svPlayer . SendTextMenu ( player . T ( "info_title" ) , sb . ToString ( ) ) ;
3337 }
@@ -58,7 +62,7 @@ private StringBuilder GetOfflineInfo(User target)
5862
5963 . Append ( " - Apartments: " ) . Append ( target . Character . Apartments . Count ) . Append ( ", Indexes: " ) . Append ( string . Join ( ", " , target . Character . Apartments . Select ( x => x . Index ) ) )
6064 . Append ( " - Wearables: " ) . AppendLine ( string . Join ( "\n - " , target . Character . Wearables ) )
61- . Append ( " - Items: " ) . AppendLine ( string . Join ( "\n - " , target . Character . Items . Select ( x => x . Key + ": " + x . Value ) ) )
65+ . Append ( " - Items: " ) . AppendLine ( string . Join ( "\n - " , target . Character . Items . Select ( x => x . Key + ": " + Core . Instance . EntityHandler . Items . FirstOrDefault ( search => search . Value . index == x . Value ) . Value . item ) ) )
6266
6367 . AppendLine ( " - Job: " )
6468 . Append ( " - Index: " ) . AppendLine ( target . Character . Job . JobIndex . ToString ( ) )
0 commit comments