summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd_notice.cpp6
-rw-r--r--src/cmd_privmsg.cpp6
-rw-r--r--src/cmd_whois.cpp5
3 files changed, 14 insertions, 3 deletions
diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index d97743a43..f66341846 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -117,7 +117,11 @@ CmdResult cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
return CMD_SUCCESS;
}
- dest = ServerInstance->FindNick(parameters[0]);
+ if (IS_LOCAL(user))
+ dest = ServerInstance->FindNickOnly(parameters[0]);
+ else
+ dest = ServerInstance->FindNick(parameters[0]);
+
if (dest)
{
if (!*parameters[1])
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 00a7f1366..5c3020b5b 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -118,7 +118,11 @@ CmdResult cmd_privmsg::Handle (const char** parameters, int pcnt, userrec *user)
return CMD_SUCCESS;
}
- dest = ServerInstance->FindNick(parameters[0]);
+ if (IS_LOCAL(user))
+ dest = ServerInstance->FindNickOnly(parameters[0]);
+ else
+ dest = ServerInstance->FindNick(parameters[0]);
+
if (dest)
{
if (!*parameters[1])
diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index dadb93902..b6f85e01c 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -108,7 +108,10 @@ CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
if (pcnt > 1)
userindex = 1;
- dest = ServerInstance->FindNick(parameters[userindex]);
+ if (IS_LOCAL(user))
+ dest = ServerInstance->FindNickOnly(parameters[userindex]);
+ else
+ dest = ServerInstance->FindNick(parameters[userindex]);
if (dest)
{