diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configreader.cpp | 1 | ||||
| -rw-r--r-- | src/modes/cmode_v.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index dea6a7a7d..945780a54 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -830,7 +830,6 @@ void ServerConfig::Read(bool bail, User* user, int pass) {"options", "netbuffersize","10240", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, {"options", "maxwho", "128", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, {"options", "allowhalfop", "0", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, - {"options", "allowdevoiceself", "0", new ValueContainerBool (&this->AllowDevoiceSelf), DT_BOOLEAN, NoValidation}, {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_IPADDRESS,DNSServerValidator}, {"dns", "timeout", "5", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, NoValidation}, {"options", "moduledir", MOD_PATH, new ValueContainerChar (this->ModPath), DT_CHARPTR, NoValidation}, diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp index 8b94caf08..66e58a479 100644 --- a/src/modes/cmode_v.cpp +++ b/src/modes/cmode_v.cpp @@ -136,9 +136,7 @@ std::string ModeChannelVoice::DelVoice(User *user,const char *dest,Channel *chan return ""; if (MOD_RESULT == ACR_DEFAULT) { - if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)) || - user == d && ServerInstance->Config->AllowDevoiceSelf - ) + if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server))) { user->WriteServ("482 %s %s :You are not a channel (half)operator",user->nick, chan->name); return ""; |