aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Reports and warnings

Browse Source
This commit is contained in:
Cooldude2606
2020-08-06 19:58:10 +01:00
parent a2676f0cc1
commit e44b8d52ba
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/control/reports.lua
View File

@@ -161,13 +161,10 @@ end
-- @tparam LuaPlayer player the player who is having the report removed from them -- @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 reported_by_name the player who had the report
-- @tparam string removed_by_name the player who is clearing the report -- @tparam string removed_by_name the player who is clearing the report
<<<<<<< HEAD -- @tparam number batch the index of this event in a batch, always one when not a batch
local function report_removed_event(player, reported_by_name, removed_by_name) -- @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, { 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, name = Reports.events.on_report_removed,
tick = game.tick, tick = game.tick,
player_index = player.index, player_index = player.index,

2
modules/control/warnings.lua
View File

@@ -155,6 +155,8 @@ end
-- @tparam string warning_by_name the name of the player who made the warning -- @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 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 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) 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, { script.raise_event(Warnings.events.on_warning_removed, {
name = Warnings.events.on_warning_removed, name = Warnings.events.on_warning_removed,