summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/core/db_plain.cpp7
-rw-r--r--modules/core/os_defcon.cpp6
2 files changed, 5 insertions, 8 deletions
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index dc108ac06..432313bc2 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -928,12 +928,9 @@ class DBPlain : public Module
BotInfo *bi = it->second;
db << "BI " << bi->nick << " " << bi->GetIdent() << " " << bi->host << " " << bi->created << " " << bi->chancount << " :" << bi->realname << endl;
- if (bi->FlagCount())
+ if (bi->HasFlag(BI_PRIVATE))
{
- db << "MD FLAGS";
- if (bi->HasFlag(BI_PRIVATE))
- db << " PRIVATE";
- db << endl;
+ db << "MD FLAGS PRIVATE" << endl;
}
}
diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp
index 525aa9b94..89bc2b6f0 100644
--- a/modules/core/os_defcon.cpp
+++ b/modules/core/os_defcon.cpp
@@ -225,7 +225,7 @@ class OSDefcon : public Module
EventReturn OnPreCommand(User *u, BotInfo *service, const Anope::string &command, const std::vector<Anope::string> &params)
{
- if (service == findbot(Config->s_NickServ))
+ if (service == NickServ)
{
if (command.equals_ci("REGISTER") || command.equals_ci("GROUP"))
{
@@ -236,7 +236,7 @@ class OSDefcon : public Module
}
}
}
- else if (service == findbot(Config->s_ChanServ))
+ else if (ChanServ && service == ChanServ)
{
if (command.equals_ci("SET"))
{
@@ -255,7 +255,7 @@ class OSDefcon : public Module
}
}
}
- else if (service == findbot(Config->s_MemoServ))
+ else if (MemoServ && service == MemoServ)
{
if (command.equals_ci("SEND") || command.equals_ci("SENDALL"))
{