Merge pull request #2227 from A248/patch-1

Fix NPE for invalid world argument in gamerule cmd
2020-05-05 21:19:42 -04:00 · 2020-05-05 21:19:42 -04:00 · 59cfacf007
parent 5f916fbf27 9d42a05759
commit 59cfacf007
1 changed files with 5 additions and 0 deletions
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/GameruleCommand.java
@ -62,6 +62,11 @@ public class GameruleCommand extends MultiverseCommand {
            world = p.getWorld();
        } else {
            world = Bukkit.getWorld(args.get(2));
+            if (world == null) {
+                sender.sendMessage(ChatColor.RED + "Failure!" + ChatColor.WHITE + " World " + ChatColor.AQUA + args.get(2)
+                    + ChatColor.WHITE + " does not exist.");
+                return;
+            }
        }

        if (world.setGameRuleValue(gameRule, value)) {