Merge branch 'patch/5.5.1'

This commit is contained in:
Cooldude2606
2019-05-25 16:22:39 +01:00
18 changed files with 22 additions and 19 deletions

View File

@@ -63,11 +63,11 @@ local ProgressBar = {
}
}
Global.register({
ProgressBar.unregistered,
ProgressBar.independent
unregistered = ProgressBar.unregistered,
independent = ProgressBar.independent
},function(tbl)
ProgressBar.unregistered = tbl[1]
ProgressBar.independent = tbl[2]
ProgressBar.unregistered = tbl.unregistered
ProgressBar.independent = tbl.independent
end)
--- Gets the define data, cant use Gui.get_define as it would error

View File

@@ -13,11 +13,11 @@ local Public = {
}
Global.register({
Public.compilatrons,
Public.current_messages
compilatrons = Public.compilatrons,
current_messages = Public.current_messages
},function(tbl)
Public.compilatrons=tbl[1]
Public.current_messages=tbl[2]
Public.compilatrons = tbl.compilatrons
Public.current_messages = tbl.current_messages
end)
--- This will re-create the speech bubble after it de-spawns called with set_timeout

View File

@@ -13,11 +13,11 @@ local Public = {
}
Global.register({
Public.old_roles,
Public.temp_bans
old_roles = Public.old_roles,
temp_bans = Public.temp_bans
},function(tbl)
Public.old_roles=tbl[1]
Public.temp_bans=tbl[2]
Public.old_roles = tbl.old_roles
Public.temp_bans = tbl.temp_bans
end)
local function event_emit(event,player,by_player_name,reason)

View File

@@ -15,11 +15,11 @@ local Public = {
}
Global.register({
Public.user_warnings,
Public.user_temp_warnings
user_warnings = Public.user_warnings,
user_temp_warnings = Public.user_temp_warnings
},function(tbl)
Public.user_warnings = tbl[1]
Public.user_temp_warnings = tbl[2]
Public.user_warnings = tbl.user_warnings
Public.user_temp_warnings = tbl.user_temp_warnings
end)
local function event_emit(event,player,by_player_name)

View File

@@ -23,9 +23,12 @@ end
local interface_env = {} -- used as a persistent sandbox for interface commands
local interface_callbacks = {} -- saves callbacks which can load new values per use
Global.register({interface_env,interface_callbacks},function(tbl)
interface_env = tbl[1]
interface_callbacks = tbl[2]
Global.register({
interface_env = interface_env,
interface_callbacks = interface_callbacks
},function(tbl)
interface_env = tbl.interface_env
interface_callbacks = tbl.interface_callbacks
end)
--- Adds a callback function when the interface command is used