godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #72804 from vnen/gdscript-no-onready-without-node

Browse Source 
GDScript: Fix inheritance check of @onready for inner classes
This commit is contained in:
Yuri Sizov
2023-02-06 23:03:44 +03:00
committed by GitHub
parent 9d16250353 ed5ddab7e5
commit 7b86a082be
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_parser.cpp
View File

@@ -3619,7 +3619,7 @@ bool GDScriptParser::icon_annotation(const AnnotationNode *p_annotation, Node *p
bool GDScriptParser::onready_annotation(const AnnotationNode *p_annotation, Node *p_node) {
ERR_FAIL_COND_V_MSG(p_node->type != Node::VARIABLE, false, R"("@onready" annotation can only be applied to class variables.)");
if (head && !ClassDB::is_parent_class(head->get_datatype().native_type, SNAME("Node"))) {
if (current_class && !ClassDB::is_parent_class(current_class->get_datatype().native_type, SNAME("Node"))) {
push_error(R"("@onready" can only be used in classes that inherit "Node".)", p_annotation);
}