TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
WolverinDEV
2020-01-30 12:06:39 +01:00
parent 7693f962ca
commit 8d186c18cd
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/CMakeLists.txt
+1
View File
@@ -13,6 +13,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/environment/)
#disable for debug
#add_definitions(-DRELEASE_MODE)
find_event(ON)
include_directories(../music/include/)
include_directories(../shared/src)
server/src/client/command_handler/misc.cpp
+4 -2
View File
@@ -695,7 +695,8 @@ command_result ConnectedClient::handleCommandBanAdd(Command &cmd) {
}
auto max_ban_time = server->calculate_permission(permission::i_client_ban_max_bantime, this->getClientDatabaseId(), this->getType(), 0);
if (max_ban_time.has_value && !max_ban_time.has_infinite_power()) {
if(!max_ban_time.has_value) return command_result{permission::i_client_ban_max_bantime};
if (!max_ban_time.has_infinite_power()) {
if (max_ban_time.value < time)
return command_result{permission::i_client_ban_max_bantime};
}
@@ -844,7 +845,8 @@ command_result ConnectedClient::handleCommandBanClient(Command &cmd) {
auto b_ban_hwid = permission::v2::permission_granted(1, this->calculate_permission(permission::b_client_ban_hwid, 0), false);
auto max_ban_time = this->calculate_permission(permission::i_client_ban_max_bantime, 0);
if (max_ban_time.has_value && !max_ban_time.has_infinite_power()) {
if(!max_ban_time.has_value) return command_result{permission::i_client_ban_max_bantime};
if (!max_ban_time.has_infinite_power()) {
if (max_ban_time.value < time)
return command_result{permission::i_client_ban_max_bantime};
}