Skip to content

Pass empty string instead of null for generator id and improve error message #3344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 2 commits into from
Sep 28, 2025
+7 −3
Merged

Pass empty string instead of null for generator id and improve error message #3344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f24520
Pass empty string instead of null for generator type
benwoo1110 Sep 28, 2025
7735a33
Change test error message to not show full stacktrace
benwoo1110 Sep 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/org/mvplugins/multiverse/core/world/generators/GeneratorProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,19 @@
private boolean testIsGeneratorPlugin(Plugin plugin) {
String worldName = Bukkit.getWorlds().stream().findFirst().map(World::getName).orElse("world");
try {
return plugin.getDefaultWorldGenerator(worldName, null) != null;
return plugin.getDefaultWorldGenerator(worldName, "") != null;
} catch (UnsupportedOperationException e) {
// Some plugins throw this if they don't support world generation
return false;
} catch (Throwable t) {
Logging.warning("Plugin %s threw an exception when testing if it is a generator plugin! ",
plugin.getName());
Logging.warning("This is NOT a bug in Multiverse. Do NOT report this to Multiverse support.");
t.printStackTrace();
Logging.warning("Error by plugin %s: %s", plugin.getName(), t.getMessage());
Logging.warning("This is NOT a bug in Multiverse. Do NOT report this to Multiverse support. " +

Check warning on line 106 in src/main/java/org/mvplugins/multiverse/core/world/generators/GeneratorProvider.java

View workflow job for this annotation

GitHub Actions / checkstyle / checkstyle 

[checkstyle] reported by reviewdog 🐶
'+' should be on a new line.

Raw Output:
/github/workspace/./src/main/java/org/mvplugins/multiverse/core/world/generators/GeneratorProvider.java:106:107: warning: '+' should be on a new line. (com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck)
"Enable debug mode with `/mv debug 1` to see the full stack trace.");
if (coreConfig.getGlobalDebug() >= 1) {
t.printStackTrace();
}
// Assume it's a generator plugin since it tried to do something, most likely the id is wrong.
return true;
}
Expand Down
Loading