4 files changed, 10 insertions, 9 deletions
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 569fb6772..8db699b19 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -50,9 +50,9 @@ void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
 	/* Display the channel banlist */
 	for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 	{
-		WriteServ(user->fd,"367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time);
+		user->WriteServ("367 %s %s %s %s %d",user->nick, channel->name, i->data, i->set_by, i->set_time);
 	}
-	WriteServ(user->fd,"368 %s %s :End of channel ban list",user->nick, channel->name);
+	user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
 	return;
 }
 
@@ -74,7 +74,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
 	long maxbans = GetMaxBans(chan->name);
 	if ((unsigned)chan->bans.size() > (unsigned)maxbans)
 	{
-		WriteServ(user->fd,"478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
+		user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans);
 		dest = "";
 		return dest;
 	}
diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index e9a74fc3e..7f32ad344 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -90,7 +90,7 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec
 			{
 				if ((status < STATUS_OP) && (!is_uline(user->server)))
 				{
-					WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
 					return "";
 				}
 			}
@@ -118,7 +118,7 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec
 			{
 				if ((user != d) && ((status < STATUS_OP) && (!is_uline(user->server))))
 				{
-					WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
 					return "";
 				}
 			}
@@ -128,3 +128,4 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec
 	}
 	return "";
 }
+
diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index e75e551b2..22d95d5a9 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -81,7 +81,7 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
 			{
 				if ((status < STATUS_OP) && (!is_uline(user->server)))
 				{
-					WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
 					return "";
 				}
 			}
@@ -112,7 +112,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
 			{
 				if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
 				{
-					WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
 					return "";
 				}
 			}
diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 76978d346..69f64d2da 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -81,7 +81,7 @@ std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *c
 			{
 				if ((status < STATUS_HOP) && (!is_uline(user->server)))
 				{
-					WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, chan->name);
 					return "";
 				}
 			}
@@ -109,7 +109,7 @@ std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *c
 			{
 				if ((status < STATUS_HOP) && (!is_uline(user->server)))
 				{
-					WriteServ(user->fd,"482 %s %s :You are not a channel (half)operator",user->nick, chan->name);
+					user->WriteServ("482 %s %s :You are not a channel (half)operator",user->nick, chan->name);
 					return "";
 				}
 			}