diff options
3 files changed, 7 insertions, 4 deletions
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp index ea54784f96..886d65d28c 100644 --- a/modules/gdscript/language_server/gdscript_workspace.cpp +++ b/modules/gdscript/language_server/gdscript_workspace.cpp @@ -53,7 +53,7 @@ void GDScriptWorkspace::remove_cache_parser(const String &p_path) { Map<String, ExtendGDScriptParser *>::Element *parser = parse_results.find(p_path); Map<String, ExtendGDScriptParser *>::Element *script = scripts.find(p_path); if (parser && script) { - if (script->get() && script->get() == script->get()) { + if (script->get() && script->get() == parser->get()) { memdelete(script->get()); } else { memdelete(script->get()); diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 3fb26326c0..eaaefcbccb 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -42,7 +42,7 @@ ext.getGodotPluginsBinaries = { -> String pluginsList = project.property("custom_template_plugins") if (pluginsList != null && !pluginsList.trim().isEmpty()) { for (String plugin : pluginsList.split(",")) { - binDeps += plugin + "*.aar" + binDeps += plugin.trim() + "*.aar" } } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java index 3562920182..b6d949b7bf 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java @@ -139,7 +139,10 @@ public final class GodotPluginRegistry { return; } - enabledPluginsSet = new HashSet<>(Arrays.asList(enabledPluginsList)); + enabledPluginsSet = new HashSet<>(); + for (String enabledPlugin : enabledPluginsList) { + enabledPluginsSet.add(enabledPlugin.trim()); + } } else { enabledPluginsSet = null; } @@ -148,7 +151,7 @@ public final class GodotPluginRegistry { for (String metaDataName : metaData.keySet()) { // Parse the meta-data looking for entry with the Godot plugin name prefix. if (metaDataName.startsWith(GODOT_PLUGIN_V1_NAME_PREFIX)) { - String pluginName = metaDataName.substring(godotPluginV1NamePrefixLength); + String pluginName = metaDataName.substring(godotPluginV1NamePrefixLength).trim(); if (enabledPluginsSet != null && !enabledPluginsSet.contains(pluginName)) { Log.w(TAG, "Plugin " + pluginName + " is listed in the dependencies but is not enabled."); continue; |