From 14870efc115964524b263499d33c44a0c74aff15 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 14 May 2020 15:18:39 +0200 Subject: [PATCH] Fixed permission assignments --- git-teaspeak | 2 +- server/src/client/command_handler/bulk_parsers.h | 8 +++++--- shared | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/git-teaspeak b/git-teaspeak index a8a0aab..be826cc 160000 --- a/git-teaspeak +++ b/git-teaspeak @@ -1 +1 @@ -Subproject commit a8a0aabd7fca05b950de9f781a3cd6ba5b799f79 +Subproject commit be826ccb507a84d97c9c07397b05a8fe731f7ce5 diff --git a/server/src/client/command_handler/bulk_parsers.h b/server/src/client/command_handler/bulk_parsers.h index 4b7f76b..b25c8ec 100644 --- a/server/src/client/command_handler/bulk_parsers.h +++ b/server/src/client/command_handler/bulk_parsers.h @@ -78,13 +78,15 @@ namespace ts::command::bulk_parser { inline void apply_to(const std::shared_ptr& manager, permission::v2::PermissionUpdateType mode) const { if(this->is_grant_permission()) { - manager->set_permission(this->permission_type(), { this->value(), true }, permission::v2::PermissionUpdateType::do_nothing, mode); + manager->set_permission(this->permission_type(), { 0, this->value() }, permission::v2::PermissionUpdateType::do_nothing, mode); } else { manager->set_permission( this->permission_type(), - { this->value(), true }, + { this->value(), 0 }, mode, - permission::v2::PermissionUpdateType::do_nothing + permission::v2::PermissionUpdateType::do_nothing, + this->flag_skip(), + this->flag_negated() ); } } diff --git a/shared b/shared index a4febf7..f404d5e 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit a4febf7b5af191d41c566292958c55155128f16f +Subproject commit f404d5e1fa5ed1cfbe3ef9a97c0e81c1fba943ff