From 93a446747bed210aa83cbf0a203cd98a3a2211b2 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Mon, 5 Apr 2021 22:55:25 +0100 Subject: [PATCH] Fixed self reporting --- config/gui/player_list_actions.lua | 1 + locale/en/commands.cfg | 1 + modules/commands/reports.lua | 2 ++ 3 files changed, 4 insertions(+) diff --git a/config/gui/player_list_actions.lua b/config/gui/player_list_actions.lua index 1464a1d3..411d2395 100644 --- a/config/gui/player_list_actions.lua +++ b/config/gui/player_list_actions.lua @@ -173,6 +173,7 @@ return { }, ['command/report'] = { auth=function(player,selected_player) + if player == selected_player then return false end if not Roles.player_allowed(player,'command/give-warning') then return not Roles.player_has_flag(selected_player,'report-immune') end diff --git a/locale/en/commands.cfg b/locale/en/commands.cfg index dea7b935..1a053c7e 100644 --- a/locale/en/commands.cfg +++ b/locale/en/commands.cfg @@ -29,6 +29,7 @@ not-jailed=__1__ is not currently in jail. [expcom-report] player-immune=This player can not be reported. +self-report=You can not report your self. non-admin=__1__ was reported for __2__. admin=__1__ was reported by __2__ for __3__. already-reported=You can only report a player once, you can ask a moderator to clear this report. diff --git a/modules/commands/reports.lua b/modules/commands/reports.lua index f5923066..6609189e 100644 --- a/modules/commands/reports.lua +++ b/modules/commands/reports.lua @@ -28,6 +28,8 @@ Commands.new_command('report', 'Reports a player and notifies moderators') if not input then return end if Roles.player_has_flag(input, 'report-immune') then return reject{'expcom-report.player-immune'} + elseif player == input then + return reject{'expcom-report.self-report'} else return input end