Merge branch 'dev' into ai

This commit is contained in:
Maruno17
2022-10-04 22:56:27 +01:00
56 changed files with 2341 additions and 912 deletions

View File

@@ -359,7 +359,7 @@ class CallbackWrapper
def execute(given_block = nil, *args)
execute_block = given_block || @code_block
@params.each do |key, value|
args.instance_variable_set("@#{key.to_s}", value)
args.instance_variable_set("@#{key}", value)
end
args.instance_eval(&execute_block)
end

View File

@@ -627,7 +627,11 @@ module PluginManager
# get the order of plugins to interpret
order, plugins = self.getPluginOrder
# compile if necessary
self.compilePlugins(order, plugins) if self.needCompiling?(order, plugins)
if self.needCompiling?(order, plugins)
self.compilePlugins(order, plugins)
else
Console.echoln_li "Plugins were not compiled."
end
# load plugins
scripts = load_data("Data/PluginScripts.rxdata")
echoed_plugins = []