Merge pull request #3423 from Multiverse/fix/placeholder-null

Fix null error when world name for non-player placeholders not specified

src/main/java/org/mvplugins/multiverse/core/PlaceholderExpansionHook.java

@@ -113,7 +113,7 @@ final class PlaceholderExpansionHook extends PlaceholderExpansion {
                 return Option.of(player.getWorld().getName());
             } else {
                 warning("You must specify a world name for non-player placeholders");
-                return null;
+                return Option.none();
             }
         }