From b7dab9d64c5b36e94262ad127ce80ed83226b56f Mon Sep 17 00:00:00 2001
From: Paweł Redman <pawel.redman@gmail.com>
Date: Thu, 13 Apr 2017 11:30:00 +0000
Subject: Make SEESFULLLISTPLAYERS great again.

---
 src/game/g_admin.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/game/g_admin.c')

diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index 481f957..7bd4f0d 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -5038,7 +5038,8 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
       }
     }
     immune[ 0 ] = '\0';
-    if( G_admin_permission( &g_entities[ i ], ADMF_BAN_IMMUNITY ) )
+    if( G_admin_permission( &g_entities[ i ], ADMF_BAN_IMMUNITY ) &&
+        G_admin_permission(ent, ADMF_SEESFULLLISTPLAYERS ) )
     {
       Q_strncpyz( immune, "I", sizeof( immune ) );
     }
@@ -5095,8 +5096,7 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
     else
       karma[ 0 ] = '\0';
 
-     if( G_admin_permission(ent, ADMF_SEESFULLLISTPLAYERS ) ) {
- 
+    if ( G_admin_permission(ent, ADMF_SEESFULLLISTPLAYERS ) ) {
       ADMBP( va( "%2i %s%s^7%s %-2i %s^7 (*%s) ^1%1s%1s%1s%1s^7 %s^7 %s%s^7%s\n",
                i,
                c,
@@ -5114,20 +5114,24 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
                n,
                ( *n ) ? ")" : ""
              ) );
-     }
-     else
-     {
-      ADMBP( va( "%2i %s%s^7%s ^1%1s%1s%1s^7 %s^7\n",
+    } else {
+      ADMBP( va( "%2i %s%s^7%s %-2i %s^7 ^1%1s%1s%1s%1s^7 %s^7 %s%s^7%s\n",
                i,
                c,
                t,
                karma,
+               l,
+               ( *lname ) ? lname2 : "", 
+               immune,
                muted,
                dbuilder,
                denied,
-               p->pers.netname
+               p->pers.netname,
+               ( *n ) ? "(a.k.a. " : "",
+               n,
+               ( *n ) ? ")" : ""
              ) );
-     }
+    }
   }
   ADMBP_end();
   return qtrue;
-- 
cgit