mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2026-04-03 06:16:15 +00:00
Compare commits
6 Commits
v2.3.1
...
fix-help-a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f03d21dea | ||
|
|
00bd5be4d0 | ||
|
|
dff2f2712b | ||
|
|
3effe0d4de | ||
|
|
d58ff960ec | ||
|
|
f67f8573e0 |
6
.github/pull_request_template.md
vendored
Normal file
6
.github/pull_request_template.md
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
Please replace this text <-> with your PR description and leave the below declarations intact.
|
||||
|
||||
---
|
||||
|
||||
By creating this pull request, I understand that code that is AI generated or otherwise automatically generated may be rejected without further discussion.
|
||||
I declare that I fully understand all code I pushed into this PR, and wrote all this code myself and own the rights to this code.
|
||||
@@ -25,7 +25,7 @@ std::vector<char> Comp(std::span<const char> input) {
|
||||
reinterpret_cast<const Bytef*>(input.data()),
|
||||
static_cast<uLongf>(input.size()));
|
||||
if (res != Z_OK) {
|
||||
error("zlib compress() failed: " + std::to_string(res));
|
||||
error("zlib compress() failed (code: " + std::to_string(res) + ", message: " + zError(res) + ")");
|
||||
throw std::runtime_error("zlib compress() failed");
|
||||
}
|
||||
debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B");
|
||||
@@ -52,7 +52,7 @@ std::vector<char> DeComp(std::span<const char> input) {
|
||||
output_buffer.resize(output_buffer.size() * 2);
|
||||
output_size = output_buffer.size();
|
||||
} else if (res != Z_OK) {
|
||||
error("zlib uncompress() failed: " + std::to_string(res));
|
||||
error("zlib uncompress() failed (code: " + std::to_string(res) + ", message: " + zError(res) + ")");
|
||||
throw std::runtime_error("zlib uncompress() failed");
|
||||
} else if (res == Z_OK) {
|
||||
break;
|
||||
|
||||
@@ -30,7 +30,6 @@ void ParseConfig(const nlohmann::json& d) {
|
||||
}
|
||||
if (d.contains("CachingDirectory") && d["CachingDirectory"].is_string()) {
|
||||
CachingDirectory = d["CachingDirectory"].get<std::string>();
|
||||
info("Mod caching directory: " + CachingDirectory);
|
||||
}
|
||||
|
||||
if (d.contains("Dev") && d["Dev"].is_boolean()) {
|
||||
|
||||
@@ -104,7 +104,7 @@ void CoreSend(std::string data) {
|
||||
}
|
||||
|
||||
bool IsAllowedLink(const std::string& Link) {
|
||||
std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|beammp\.gg|github.com\/BeamMP\/|discord\.gg|patreon\.com\/BeamMP))");
|
||||
std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|beammp\.gg|github\.com\/BeamMP\/|discord\.gg|patreon\.com\/BeamMP))");
|
||||
std::smatch link_match;
|
||||
return std::regex_search(Link, link_match, link_pattern) && link_match.position() == 0;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ std::string GetVer() {
|
||||
return "2.3";
|
||||
}
|
||||
std::string GetPatch() {
|
||||
return ".1";
|
||||
return ".2";
|
||||
}
|
||||
|
||||
std::string GetEP(const char* P) {
|
||||
|
||||
@@ -43,6 +43,7 @@ int main(int argc, const char** argv) try {
|
||||
InitLog();
|
||||
ConfigInit();
|
||||
InitOptions(argc, argv, options);
|
||||
info("Mod caching directory: " + CachingDirectory);
|
||||
InitLauncher();
|
||||
|
||||
info("IMPORTANT: You MUST keep this window open to play BeamMP!");
|
||||
|
||||
Reference in New Issue
Block a user