From 24b53ba5540152ee3a395b42465fc27f14a90cc5 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Fri, 30 Aug 2019 14:21:55 +0100 Subject: [PATCH] Fixed global register in control files --- modules/control/jail.lua | 6 ++++-- modules/control/reports.lua | 3 ++- modules/control/rockets.lua | 9 ++++++--- modules/control/tasks.lua | 6 ++++-- modules/control/warnings.lua | 6 ++++-- modules/control/warps.lua | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/modules/control/jail.lua b/modules/control/jail.lua index c9a0619e..89c9043c 100644 --- a/modules/control/jail.lua +++ b/modules/control/jail.lua @@ -66,8 +66,10 @@ Global.register({ old_roles = old_roles, temp_bans = temp_bans },function(tbl) - old_roles = tbl.old_roles - temp_bans = tbl.temp_bans + Jail.old_roles = tbl.old_roles + Jail.temp_bans = tbl.temp_bans + old_roles = Jail.old_roles + temp_bans = Jail.temp_bans end) --- Used to emit the jail related events diff --git a/modules/control/reports.lua b/modules/control/reports.lua index ed559ed1..d5d5cf1b 100644 --- a/modules/control/reports.lua +++ b/modules/control/reports.lua @@ -49,7 +49,8 @@ local Reports = { local user_reports = Reports.user_reports Global.register(user_reports,function(tbl) - user_reports = tbl + Reports.user_reports = tbl + user_reports = Reports.user_reports end) --- Getters. diff --git a/modules/control/rockets.lua b/modules/control/rockets.lua index 6ddc31d3..63e4928e 100644 --- a/modules/control/rockets.lua +++ b/modules/control/rockets.lua @@ -50,9 +50,12 @@ Global.register({ rocket_stats = rocket_stats, rocket_silos = rocket_silos },function(tbl) - rocket_times = tbl.rocket_times - rocket_stats = tbl.rocket_stats - rocket_silos = tbl.rocket_silos + Rockets.times = tbl.rocket_times + Rockets.stats = tbl.rocket_stats + Rockets.silos = tbl.rocket_silos + rocket_times = Rockets.times + rocket_stats = Rockets.stats + rocket_silos = Rockets.silos end) --- Gets the silo data for a given silo entity diff --git a/modules/control/tasks.lua b/modules/control/tasks.lua index 5836385b..5adcc984 100644 --- a/modules/control/tasks.lua +++ b/modules/control/tasks.lua @@ -42,8 +42,10 @@ Global.register({ task_details=task_details, force_tasks=force_tasks },function(tbl) - task_details = tbl.task_details - force_tasks = tbl.force_tasks + Tasks.details = tbl.task_details + Tasks.forces = tbl.force_tasks + task_details = Tasks.details + force_tasks = Tasks.forces end) local task_store = Tasks.store diff --git a/modules/control/warnings.lua b/modules/control/warnings.lua index a618cbaa..ebd3612d 100644 --- a/modules/control/warnings.lua +++ b/modules/control/warnings.lua @@ -66,8 +66,10 @@ Global.register({ user_warnings = user_warnings, user_script_warnings = user_script_warnings },function(tbl) - user_warnings = tbl.user_warnings - user_script_warnings = tbl.user_script_warnings + Warnings.user_warnings = tbl.user_warnings + Warnings.user_script_warnings = tbl.user_script_warnings + user_warnings = Warnings.user_warnings + user_script_warnings = Warnings.user_script_warnings end) --- Gets an array of warnings that the player has, always returns a list even if emtpy diff --git a/modules/control/warps.lua b/modules/control/warps.lua index 7ce2ec4d..b3e7454d 100644 --- a/modules/control/warps.lua +++ b/modules/control/warps.lua @@ -47,8 +47,10 @@ Global.register({ warp_details=warp_details, force_warps=force_warps },function(tbl) - force_warps = tbl.force_warps - warp_details = tbl.warp_details + Warps.details = tbl.force_warps + Warps.forces = tbl.warp_details + warp_details = Warps.details + force_warps = Warps.forces end) local warp_names = Warps.store.names