oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Adds validation fixes for commands (#401)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-09-24 23:05:18 +02:00
committed by GitHub
parent 527fe84d3c
commit 2273d97d86
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core/game/core-scripts/esc/commands/set_sound_state.gd
View File

@@ -32,7 +32,7 @@ func validate(arguments: Array):
) )
return false return false
if not arguments[1] in ["default", "off"] \ if not arguments[1] in ["default", "off"] \
or not ResourceLoader.exists(arguments[1]): and not ResourceLoader.exists(arguments[1]):
escoria.logger.report_errors( escoria.logger.report_errors(
"SetSoundStateCommand.validate: invalid sound", "SetSoundStateCommand.validate: invalid sound",
[ [

3
addons/escoria-core/game/core-scripts/esc/types/esc_command.gd
View File

@@ -113,7 +113,8 @@ func run() -> int:
var prepared_arguments = argument_descriptor.prepare_arguments( var prepared_arguments = argument_descriptor.prepare_arguments(
self.parameters self.parameters
) )
if argument_descriptor.validate(self.name, prepared_arguments): if argument_descriptor.validate(self.name, prepared_arguments) and\
command_object.validate(prepared_arguments):
escoria.logger.debug("Running command %s with parameters %s" % [ escoria.logger.debug("Running command %s with parameters %s" % [
self.name, self.name,
prepared_arguments prepared_arguments