Fixed charybdis and ratbox protocol modules not (properly) translating TS6 UIDs into nicks on kills.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 5cf828e73..e302f57f5 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1106,15 +1106,17 @@ int anope_event_away(char *source, int ac, char **av)
 int anope_event_kill(char *source, int ac, char **av)
 {
     User *u = NULL;
+    Uid *ud = NULL;
 
     if (ac != 2)
         return MOD_CONT;
 
     if (UseTS6) {
         u = find_byuid(av[0]);
+        ud = find_nickuid(av[0]);
     }
 
-    m_kill(u ? u->nick : av[0], av[1]);
+    m_kill(u ? u->nick : (ud ? ud->nick : av[0]), av[1]);
     return MOD_CONT;
 }