From 708a44a040c68b2b6e7e689441807b788cbe38fb Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Sun, 11 Sep 2016 16:49:09 +0200 Subject: Move check if server should be set to admin to right place --- src/crsm.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/crsm.cpp b/src/crsm.cpp index 7f9bfbd..ab88025 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -1584,6 +1584,11 @@ void CRSM::setIngameAdmin(const ClientInfo &client, const QString& newAdmin) } Session.Clonk.Admin = info; } + else if(newAdmin == Config.Auto.Volatile.Clonk.ServerNick || newAdmin == Config.Auto.Volatile.Clonk.ServerPCName) + { + respond(client, "Der Server kann nicht als Rundenadmin eingetragen werden!\n"); + return; + } else { bool notFound = true, ambigous = false; @@ -2343,11 +2348,6 @@ CMD_FUNCTION_IMPL(admin) { case Clonk: interfaceAdminPtr = &Session.Clonk.Admin; - if(args == Config.Auto.Volatile.Clonk.ServerNick || args == Config.Auto.Volatile.Clonk.ServerPCName) - { - respond(client, "Der Server kann nicht als Rundenadmin eingetragen werden!\n"); - return Success; - } break; case IRC: interfaceAdminPtr = &Session.IRC.Admin; -- cgit v1.2.3-54-g00ecf