From 7607ef66aaaa1e71a0a67583df2bb7150785bbdc Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Thu, 31 Jul 2014 17:35:56 +0300 Subject: [PATCH] Allow banning without who banned player --- GlobalMethods.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/GlobalMethods.h b/GlobalMethods.h index 6aba34d..ffebcfa 100644 --- a/GlobalMethods.h +++ b/GlobalMethods.h @@ -948,11 +948,10 @@ namespace LuaGlobalFunctions int Ban(lua_State* L) { int banMode = Eluna::CHECKVAL(L, 1); - const char* nameOrIP_cstr = Eluna::CHECKVAL(L, 2); + std::string nameOrIP = Eluna::CHECKVAL(L, 2); uint32 duration = Eluna::CHECKVAL(L, 3); const char* reason = Eluna::CHECKVAL(L, 4); - Player* whoBanned = Eluna::CHECKOBJ(L, 5); - std::string nameOrIP(nameOrIP_cstr); + const char* whoBanned = Eluna::CHECKOBJ(L, 5); switch (banMode) { @@ -977,19 +976,7 @@ namespace LuaGlobalFunctions return 0; } - switch (eWorld->BanAccount((BanMode)banMode, nameOrIP, duration, reason, whoBanned->GetSession() ? whoBanned->GetName() : "")) - { - case BAN_SUCCESS: - if (duration > 0) - ChatHandler(whoBanned->GetSession()).PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(duration, true).c_str(), reason); - else - ChatHandler(whoBanned->GetSession()).PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reason); - break; - case BAN_SYNTAX_ERROR: - return 0; - case BAN_NOTFOUND: - return 0; - } + eWorld->BanAccount((BanMode)banMode, nameOrIP, duration, reason, whoBanned); return 0; }