Skip to content

Commit

Permalink
Fix: Avoid globals starting with 'i/' (#556)
Browse files Browse the repository at this point in the history
  • Loading branch information
StraToN authored Apr 8, 2022
1 parent 431efd8 commit 05f139e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ func configure() -> ESCCommandArgumentDescriptor:
)


# Validate whether the given arguments match the command descriptor
func validate(arguments: Array):
if arguments[0].begins_with("i/"):
escoria.logger.report_errors(
"inventory_add: invalid item name",
[
"Item name %s cannot start with 'i/'." % arguments[0]
]
)
return false
return .validate(arguments)


# Run the command
func run(command_params: Array) -> int:
escoria.inventory_manager.add_item(command_params[0])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ func set_global(key: String, value, ignore_reserved: bool = false) -> void:
"Global key %s is reserved and can not be overridden" % key
]
)

emit_signal(
"global_changed",
key,
Expand Down

0 comments on commit 05f139e

Please sign in to comment.