From e44b8d52ba6fb67bde7ba17783a9566c19a8a524 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 6 Aug 2020 19:58:10 +0100 Subject: [PATCH] Fixed Reports and warnings --- modules/control/reports.lua | 9 +++------ modules/control/warnings.lua | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/control/reports.lua b/modules/control/reports.lua index 2c62ce75..ea2a710f 100644 --- a/modules/control/reports.lua +++ b/modules/control/reports.lua @@ -161,13 +161,10 @@ end -- @tparam LuaPlayer player the player who is having the report removed from them -- @tparam string reported_by_name the player who had the report -- @tparam string removed_by_name the player who is clearing the report -<<<<<<< HEAD -local function report_removed_event(player, reported_by_name, removed_by_name) +-- @tparam number batch the index of this event in a batch, always one when not a batch +-- @tparam number batch_count the number of reports removed in this batch, always one when not a batch +local function report_removed_event(player, reported_by_name, removed_by_name, batch, batch_count) script.raise_event(Reports.events.on_report_removed, { -======= -local function report_removed_event(player,reported_by_name,removed_by_name,batch,batch_count) - script.raise_event(Reports.events.on_report_removed,{ ->>>>>>> 6.0.11 name = Reports.events.on_report_removed, tick = game.tick, player_index = player.index, diff --git a/modules/control/warnings.lua b/modules/control/warnings.lua index 10d75e77..aca6f1ba 100644 --- a/modules/control/warnings.lua +++ b/modules/control/warnings.lua @@ -155,6 +155,8 @@ end -- @tparam string warning_by_name the name of the player who made the warning -- @tparam string removed_by_name the name of the player who is doing the action -- @tparam number warning_count the number of warnings that the player how has +-- @tparam number batch the index of this event in a batch, always one when not a batch +-- @tparam number batch_count the number of reports removed in this batch, always one when not a batch local function warning_removed_event(player, warning_by_name, removed_by_name, warning_count, batch, batch_count) script.raise_event(Warnings.events.on_warning_removed, { name = Warnings.events.on_warning_removed,