3 files changed, 29 insertions, 4 deletions
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 4cad8ebc2..017217073 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -33,7 +33,7 @@ class BlockCaps : public ModeHandler
 		{
 			if (!channel->IsModeSet('P'))
 			{
-				channel->SetCustomMode('P',true);
+				channel->SetMode('P',true);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -41,7 +41,7 @@ class BlockCaps : public ModeHandler
 		{
 			if (channel->IsModeSet('P'))
 			{
-				channel->SetCustomMode('P',false);
+				channel->SetMode('P',false);
 				return MODEACTION_ALLOW;
 			}
 		}
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 04c621ac0..f517ba215 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -36,7 +36,7 @@ class BlockColor : public ModeHandler
 		{
 			if (!channel->IsModeSet('c'))
 			{
-				channel->SetCustomMode('c',true);
+				channel->SetMode('c',true);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -44,7 +44,7 @@ class BlockColor : public ModeHandler
 		{
 			if (channel->IsModeSet('c'))
 			{
-				channel->SetCustomMode('c',false);
+				channel->SetMode('c',false);
 				return MODEACTION_ALLOW;
 			}
 		}
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 612eb3b9c..d5757c002 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -24,6 +24,31 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
+class BotMode : public ModeHandler
+{
+	BotMode() : ModeHandler('B', 0, 0, false, MODETYPE_USER, false) { }
+
+	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	{
+		if (adding)
+		{
+			if (!dest->IsModeSet('B'))
+			{
+				user->SetMode('B',true);
+				return MODEACTION_ALLOW;
+			}
+		}
+		else
+		{
+			if (dest->IsModeSet('B'))
+			{
+				user->SetMode('B',false);
+				return MODEACTION_ALLOW;
+			}
+		}
+	}
+};
+
 class ModuleBotMode : public Module
 {
 	Server *Srv;