Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Commands: Cleanup in 0940f3e077

Browse Source 
(cherry picked from commit a3b4c40073)
This commit is contained in:
Vincent-Michael
2016-05-08 00:25:57 +02:00
committed by Aokromes
parent 3e42602afc
commit d7e103c543
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/scripts/Commands/cs_server.cpp
View File

@@ -29,7 +29,7 @@ EndScriptData */
#include "Player.h"
#include "ScriptMgr.h"
#include "GitRevision.h"
#include <regex>
#include "Util.h"
class server_commandscript : public CommandScript
{
@@ -328,27 +328,7 @@ private:
}
else
{
std::string timeStr(args);
static std::regex const regex("[0-9]+[A-Za-z]");
auto itr = std::sregex_iterator(timeStr.begin(), timeStr.end(), regex);
auto timesEnd = std::sregex_iterator();
for (; itr != timesEnd; ++itr)
{
std::string timeString = itr->str();
int32 amount = atoi(timeString.c_str());
if (std::count(timeString.begin(), timeString.end(), 'd') == 1)
delay += amount * DAY;
else if (std::count(timeString.begin(), timeString.end(), 'h') == 1)
delay += amount * HOUR;
else if (std::count(timeString.begin(), timeString.end(), 'm') == 1)
delay += amount * MINUTE;
else if (std::count(timeString.begin(), timeString.end(), 's') == 1)
delay += amount * 1;
else
return false;
}
delay = TimeStringToSecs(std::string(args));
if (delay == 0 || delay < 0)
return false;