Skip to content

Commit

Permalink
Remove duplicate event schema and unnecessary pattern match
Browse files Browse the repository at this point in the history
  • Loading branch information
ink0rr committed Oct 8, 2024
1 parent 2946ad3 commit 5572281
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 24 deletions.
2 changes: 1 addition & 1 deletion source/behavior/entities/format/components/breedable.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"title": "Baby Type"
},
"breed_event": {
"$ref": "../types/event_object_filters.json",
"$ref": "../types/event_object.json",
"description": "Event to run when this entity breeds.",
"title": "Breed Event"
},
Expand Down
4 changes: 2 additions & 2 deletions source/behavior/entities/format/types/event.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
}
],
"oneOf": [
{ "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire." },
{ "type": "string", "description": "The event to fire." },
{
"type": "object",
"properties": {
"event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire.", "title": "Event" },
"event": { "type": "string", "description": "The event to fire.", "title": "Event" },
"target": {
"type": "string",
"description": "The target of the event.",
Expand Down
2 changes: 1 addition & 1 deletion source/behavior/entities/format/types/event_object.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"filters": {
"$ref": "../../filters/filters.json"
},
"event": { "type": "string", "pattern": "^[a-zA-Z0-9_\\-:]+$", "description": "The event to fire.", "title": "Event" },
"event": { "type": "string", "description": "The event to fire.", "title": "Event" },
"target": {
"type": "string",
"description": "The target of the event.",
Expand Down
20 changes: 0 additions & 20 deletions source/behavior/entities/format/types/event_object_filters.json

This file was deleted.

0 comments on commit 5572281

Please sign in to comment.