mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2025-12-30 20:41:41 +09:00
Merge branch 'patch/5.9.3'
This commit is contained in:
@@ -66,8 +66,10 @@ Global.register({
|
|||||||
old_roles = old_roles,
|
old_roles = old_roles,
|
||||||
temp_bans = temp_bans
|
temp_bans = temp_bans
|
||||||
},function(tbl)
|
},function(tbl)
|
||||||
old_roles = tbl.old_roles
|
Jail.old_roles = tbl.old_roles
|
||||||
temp_bans = tbl.temp_bans
|
Jail.temp_bans = tbl.temp_bans
|
||||||
|
old_roles = Jail.old_roles
|
||||||
|
temp_bans = Jail.temp_bans
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--- Used to emit the jail related events
|
--- Used to emit the jail related events
|
||||||
|
|||||||
@@ -49,7 +49,8 @@ local Reports = {
|
|||||||
|
|
||||||
local user_reports = Reports.user_reports
|
local user_reports = Reports.user_reports
|
||||||
Global.register(user_reports,function(tbl)
|
Global.register(user_reports,function(tbl)
|
||||||
user_reports = tbl
|
Reports.user_reports = tbl
|
||||||
|
user_reports = Reports.user_reports
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--- Getters.
|
--- Getters.
|
||||||
|
|||||||
@@ -50,9 +50,12 @@ Global.register({
|
|||||||
rocket_stats = rocket_stats,
|
rocket_stats = rocket_stats,
|
||||||
rocket_silos = rocket_silos
|
rocket_silos = rocket_silos
|
||||||
},function(tbl)
|
},function(tbl)
|
||||||
rocket_times = tbl.rocket_times
|
Rockets.times = tbl.rocket_times
|
||||||
rocket_stats = tbl.rocket_stats
|
Rockets.stats = tbl.rocket_stats
|
||||||
rocket_silos = tbl.rocket_silos
|
Rockets.silos = tbl.rocket_silos
|
||||||
|
rocket_times = Rockets.times
|
||||||
|
rocket_stats = Rockets.stats
|
||||||
|
rocket_silos = Rockets.silos
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--- Gets the silo data for a given silo entity
|
--- Gets the silo data for a given silo entity
|
||||||
|
|||||||
@@ -42,8 +42,10 @@ Global.register({
|
|||||||
task_details=task_details,
|
task_details=task_details,
|
||||||
force_tasks=force_tasks
|
force_tasks=force_tasks
|
||||||
},function(tbl)
|
},function(tbl)
|
||||||
task_details = tbl.task_details
|
Tasks.details = tbl.task_details
|
||||||
force_tasks = tbl.force_tasks
|
Tasks.forces = tbl.force_tasks
|
||||||
|
task_details = Tasks.details
|
||||||
|
force_tasks = Tasks.forces
|
||||||
end)
|
end)
|
||||||
|
|
||||||
local task_store = Tasks.store
|
local task_store = Tasks.store
|
||||||
|
|||||||
@@ -66,8 +66,10 @@ Global.register({
|
|||||||
user_warnings = user_warnings,
|
user_warnings = user_warnings,
|
||||||
user_script_warnings = user_script_warnings
|
user_script_warnings = user_script_warnings
|
||||||
},function(tbl)
|
},function(tbl)
|
||||||
user_warnings = tbl.user_warnings
|
Warnings.user_warnings = tbl.user_warnings
|
||||||
user_script_warnings = tbl.user_script_warnings
|
Warnings.user_script_warnings = tbl.user_script_warnings
|
||||||
|
user_warnings = Warnings.user_warnings
|
||||||
|
user_script_warnings = Warnings.user_script_warnings
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--- Gets an array of warnings that the player has, always returns a list even if emtpy
|
--- Gets an array of warnings that the player has, always returns a list even if emtpy
|
||||||
|
|||||||
@@ -47,8 +47,10 @@ Global.register({
|
|||||||
warp_details=warp_details,
|
warp_details=warp_details,
|
||||||
force_warps=force_warps
|
force_warps=force_warps
|
||||||
},function(tbl)
|
},function(tbl)
|
||||||
force_warps = tbl.force_warps
|
Warps.details = tbl.force_warps
|
||||||
warp_details = tbl.warp_details
|
Warps.forces = tbl.warp_details
|
||||||
|
warp_details = Warps.details
|
||||||
|
force_warps = Warps.forces
|
||||||
end)
|
end)
|
||||||
|
|
||||||
local warp_names = Warps.store.names
|
local warp_names = Warps.store.names
|
||||||
|
|||||||
Reference in New Issue
Block a user