From 91df762e93212958db487d8517addba1a63a4ddd Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 13 Sep 2009 20:30:47 +0000
Subject: Membership* changes

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11697 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/commands/cmd_privmsg.cpp | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src/commands/cmd_privmsg.cpp')

diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index 5861bd086..e05366fa0 100644
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -13,14 +13,6 @@
 
 #include "inspircd.h"
 
-#ifndef __CMD_PRIVMSG_H__
-#define __CMD_PRIVMSG_H__
-
-// include the common header files
-
-#include "users.h"
-#include "channels.h"
-
 /** Handle /PRIVMSG. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
  * the same way, however, they can be fully unloaded, where these
@@ -41,9 +33,6 @@ class CommandPrivmsg : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
 };
 
-#endif
-
-
 CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, User *user)
 {
 	User *dest;
@@ -89,11 +78,11 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 	{
 		chan = ServerInstance->FindChan(target);
 
-		except_list[user] = user->nick;
+		except_list.insert(user);
 
 		if (chan)
 		{
-			if (IS_LOCAL(user) && chan->GetStatus(user) < STATUS_VOICE)
+			if (IS_LOCAL(user) && chan->GetPrefixValue(user) < VOICE_VALUE)
 			{
 				if (chan->IsModeSet('n') && !chan->HasUser(user))
 				{
-- 
cgit v1.2.3