8 files changed, 18 insertions, 18 deletions
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 166ada3bb..22a59ebce 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -180,9 +180,9 @@ class BahamutIRCdProto : public IRCDProto
 			/* If the user is internally on the channel with flags, kill them so that
 			 * the stacker will allow this.
 			 */
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 			if (uc != NULL)
-				uc->status->ClearFlags();
+				uc->status.ClearFlags();
 
 			BotInfo *setter = BotInfo::Find(user->nick);
 			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 331db994f..55c126a90 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -100,10 +100,10 @@ class HybridProto : public IRCDProto
 		/* And update our internal status for this user since this is not going through our mode handling system */
 		if (status != NULL)
 		{
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 
 			if (uc != NULL)
-				*uc->status = *status;
+				uc->status = *status;
 		}
 	}
 
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 23bd5bca8..c95645de9 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -213,9 +213,9 @@ class InspIRCdProto : public IRCDProto
 			/* If the user is internally on the channel with flags, kill them so that
 			 * the stacker will allow this.
 			 */
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 			if (uc != NULL)
-				uc->status->ClearFlags();
+				uc->status.ClearFlags();
 
 			BotInfo *setter = BotInfo::Find(user->nick);
 			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 38d5c06fb..53ca4ec62 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -229,9 +229,9 @@ class InspIRCd12Proto : public IRCDProto
 			/* If the user is internally on the channel with flags, kill them so that
 			 * the stacker will allow this.
 			 */
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 			if (uc != NULL)
-				uc->status->ClearFlags();
+				uc->status.ClearFlags();
 
 			BotInfo *setter = BotInfo::Find(user->nick);
 			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 62b77e6f7..8029a54fb 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -107,9 +107,9 @@ class InspIRCdExtBan : public ChannelModeList
 			Channel *c = Channel::Find(channel);
 			if (c != NULL)
 			{
-				UserContainer *uc = c->FindUser(u);
+				ChanUserContainer *uc = c->FindUser(u);
 				if (uc != NULL)
-					if (cm == NULL || uc->status->HasFlag(cm->name))
+					if (cm == NULL || uc->status.HasFlag(cm->name))
 						return true;
 			}
 		}
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 714dcb095..794bb302d 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -93,9 +93,9 @@ class ngIRCdProto : public IRCDProto
 			/* If the user is internally on the channel with flags, kill them so that
 			 * the stacker will allow this.
 			 */
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 			if (uc != NULL)
-				uc->status->ClearFlags();
+				uc->status.ClearFlags();
 
 			BotInfo *setter = BotInfo::Find(user->nick);
 			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index c66d34f50..24ee42746 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -56,9 +56,9 @@ class PlexusProto : public IRCDProto
 			/* If the user is internally on the channel with flags, kill them so that
 			 * the stacker will allow this.
 			 */
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 			if (uc != NULL)
-				uc->status->ClearFlags();
+				uc->status.ClearFlags();
 
 			BotInfo *setter = BotInfo::Find(user->nick);
 			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index a14091c96..467724c49 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -164,9 +164,9 @@ class UnrealIRCdProto : public IRCDProto
 			/* If the user is internally on the channel with flags, kill them so that
 			 * the stacker will allow this.
 			 */
-			UserContainer *uc = c->FindUser(user);
+			ChanUserContainer *uc = c->FindUser(user);
 			if (uc != NULL)
-				uc->status->ClearFlags();
+				uc->status.ClearFlags();
 
 			BotInfo *setter = BotInfo::Find(user->nick);
 			for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
@@ -400,9 +400,9 @@ class UnrealExtBan : public ChannelModeList
 			Channel *c = Channel::Find(channel);
 			if (c != NULL)
 			{
-				UserContainer *uc = c->FindUser(u);
+				ChanUserContainer *uc = c->FindUser(u);
 				if (uc != NULL)
-					if (cm == NULL || uc->status->HasFlag(cm->name))
+					if (cm == NULL || uc->status.HasFlag(cm->name))
 						return true;
 			}
 		}