Merge branch 'develop' of https://github.com/pvpgn/pvpgn-server into develop

This commit is contained in:
relesgoe 2020-08-30 02:57:33 -07:00
commit 6b9d251138
3 changed files with 9 additions and 4 deletions

View file

@ -2071,6 +2071,7 @@
<item id="516" file="clan.cpp" function="clan_create">
<original>This is a newly created clan</original>
<translate></translate>
</item>
<item id="517" file="command.cpp" function="_handle_email_command">
<original>An error has occurred.</original>
<translate></translate>
@ -2132,4 +2133,4 @@
<translate></translate>
</item>
</items>
</root>
</root>

View file

@ -24,6 +24,8 @@
#include <cctype>
#include <cstdlib>
#include <fmt/format.h>
#include "compat/strcasecmp.h"
#include "common/irc_protocol.h"
@ -316,10 +318,9 @@ namespace pvpgn
if (!nick)
nick = "UserName";
std::string data(":matchbot!u@h " + std::string(command) + " " + std::string(nick) + " " + std::string(text));
data.erase(MAX_IRC_MESSAGE_LEN, std::string::npos);
std::string data = fmt::format(":matchbot!u@h {} {} {}", command, nick, text);
DEBUG2("[{}] sent \"{}\"", conn_get_socket(conn), data.c_str());
DEBUG2("[{}] sent \"{}\"", conn_get_socket(conn), data);
data.append("\r\n");
packet_set_size(p, 0);
packet_append_data(p, data.c_str(), data.length());

View file

@ -18,6 +18,7 @@
#include <array>
#include <atomic>
#include <chrono>
#include <cstdint>
#include <ctime>
#include <fstream>
@ -162,6 +163,8 @@ namespace pvpgn
curl_multi_handle_mutex.unlock();
}
std::this_thread::sleep_for(std::chrono::seconds(3));
}
}