Merge pull request #106908 from dsnopek/java-class-wrapper-object-type-bug

Repiteo · Repiteo · commit f8a478115db5 · 2025-05-28T17:09:36.000-05:00
JavaClassWrapper: Don't discard overloaded methods that differ by object type
diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp
@@ -1600,9 +1600,12 @@ Ref<JavaClass> JavaClassWrapper::_wrap(const String &p_class, bool p_allow_priva
 				if (_new != existing) {
 					this_valid = false;
 					break;
+				} else if ((_new == Variant::OBJECT || _new == Variant::ARRAY) && E->get().param_sigs[j] != mi.param_sigs[j]) {
+					this_valid = false;
+					break;
 				}
 				new_likeliness += new_l;
-				existing_likeliness = existing_l;
+				existing_likeliness += existing_l;
 			}
 
 			if (!this_valid) {

Original file line number	Diff line number	Diff line change
`@@ -1600,9 +1600,12 @@ Ref<JavaClass> JavaClassWrapper::_wrap(const String &p_class, bool p_allow_priva`
`1600`	`1600`	`if (_new != existing) {`
`1601`	`1601`	`this_valid = false;`
`1602`	`1602`	`break;`
	`1603`	`+ } else if ((_new == Variant::OBJECT \|\| _new == Variant::ARRAY) && E->get().param_sigs[j] != mi.param_sigs[j]) {`
	`1604`	`+ this_valid = false;`
	`1605`	`+ break;`
`1603`	`1606`	`}`
`1604`	`1607`	`new_likeliness += new_l;`
`1605`		`- existing_likeliness = existing_l;`
	`1608`	`+ existing_likeliness += existing_l;`
`1606`	`1609`	`}`
`1607`	`1610`
`1608`	`1611`	`if (!this_valid) {`