Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2 files changed, 26 insertions, 14 deletions

diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index 477eb3649b7..470eb27bad2 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -245,7 +245,7 @@ public:
             return false;
         }
 
-        if (!groupSource->IsFull())
+        if (groupSource->IsFull())
         {
             handler->PSendSysMessage(LANG_GROUP_FULL);
             handler->SetSentErrorMessage(true);
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index 43afea1b381..14a68d1fdae 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -30,8 +30,6 @@ EndScriptData */
 #include "ScriptMgr.h"
 #include "SystemConfig.h"
 
-#include <regex>
-
 class server_commandscript : public CommandScript
 {
 public:
@@ -296,9 +294,9 @@ public:
     }
 
 private:
-    static bool ParseExitCode(std::string const& exitCodeStr, int32& exitCode)
+    static bool ParseExitCode(char const* exitCodeStr, int32& exitCode)
     {
-        exitCode = atoi(exitCodeStr.c_str());
+        exitCode = atoi(exitCodeStr);
 
         // Handle atoi() errors
         if (exitCode == 0 && (exitCodeStr[0] != '0' || exitCodeStr[1] != '\0'))
@@ -319,28 +317,42 @@ private:
             return false;
 
         // #delay [#exit_code] [reason]
-        std::regex regex("([0-9]+) ([0-9]*) ?(.*)");
-        std::cmatch cm;
+        char* delayStr = strtok((char*)args, " ");
+        if (!delayStr || !isNumeric(delayStr))
+            return false;
+
+        char* exitCodeStr = nullptr;
 
-        if (!std::regex_match(args, cm, regex))
+        if (strlen(args) > 255)
             return false;
 
-        std::string delayStr = cm[1];
-        std::string exitCodeStr = cm[2];
-        std::string reason = cm[3];
+        char reason[255] = { 0 };
+
+        while (char* nextToken = strtok(nullptr, " "))
+        {
+            if (isNumeric(nextToken))
+                exitCodeStr = nextToken;
+            else
+            {
+                strcat(reason, nextToken);
+                strcat(reason, " ");
+                strcat(reason, strtok(nullptr, "\0"));
+                break;
+            }
+        }
 
-        int32 delay = atoi(delayStr.c_str());
+        int32 delay = atoi(delayStr);
 
         // Prevent interpret wrong arg value as 0 secs shutdown time
         if ((delay == 0 && (delayStr[0] != '0' || delayStr[1] != '\0')) || delay < 0)
             return false;
 
         int32 exitCode = defaultExitCode;
-        if (exitCodeStr.length() > 0)
+        if (exitCodeStr)
             if (!ParseExitCode(exitCodeStr, exitCode))
                 return false;
 
-        sWorld->ShutdownServ(delay, shutdownMask, static_cast<uint8>(exitCode), reason);
+        sWorld->ShutdownServ(delay, shutdownMask, static_cast<uint8>(exitCode), std::string(reason));
 
         return true;
     }