Validate that ProtoId values are not abstract #5716
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
does TryIndex even work for abstract, and if so why |
Nope, it returns false for abstract prototypes (which is how this PR checks for them). The problem linked above snuck through because the entity spawn table stuff doesn't check for abstract prototypes (which it probably should). That would just be a runtime check though - this extra validation would let the linter catch the problem. |
PJB3005
requested changes
Mar 5, 2025
| @@ -23,7 +23,12 @@ public ValidationNode Validate(ISerializationManager serialization, ValueDataNod | |||
| { | |||
| var prototypes = dependencies.Resolve<IPrototypeManager>(); | |||
| if (prototypes.TryGetKindFrom<EntityPrototype>(out _) && prototypes.HasMapping<EntityPrototype>(node.Value)) | |||
There was a problem hiding this comment.
Are these checks for HasMapping even necessary at this point?
| @@ -23,7 +23,12 @@ public ValidationNode Validate(ISerializationManager serialization, ValueDataNod | |||
| { | |||
| var prototypes = dependencies.Resolve<IPrototypeManager>(); | |||
| if (prototypes.TryGetKindFrom<EntityPrototype>(out _) && prototypes.HasMapping<EntityPrototype>(node.Value)) | |||
| { | |||
| if (!prototypes.TryIndex<EntityPrototype>(node.Value, out _)) | |||
| @@ -21,7 +21,12 @@ public ValidationNode Validate(ISerializationManager serialization, ValueDataNod | |||
| { | |||
| var prototypes = dependencies.Resolve<IPrototypeManager>(); | |||
| if (prototypes.TryGetKindFrom<T>(out _) && prototypes.HasMapping<T>(node.Value)) | |||
| { | |||
| if (!prototypes.TryIndex<T>(node.Value, out _)) | |||
| @@ -21,7 +21,12 @@ public ValidationNode Validate(ISerializationManager serialization, ValueDataNod | |||
| { | |||
| var prototypes = dependencies.Resolve<IPrototypeManager>(); | |||
| if (prototypes.TryGetKindFrom<T>(out _) && prototypes.HasMapping<T>(node.Value)) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds an extra validation step to
ProtoId<T>andEntProtoIdwhich makes sure that the prototype is not abstract. This lets YAML linter prevent attempts to spawn abstract prototypes (example: space-wizards/space-station-14#35562)If there's a valid reason to have a
ProtoIdfield for an abstract prototype, then go ahead and close this. I can't think of one, and there don't seem to be any existing uses of it.