From 76fd63d64b3980e4a7bc9be2c0f02719c866d9f8 Mon Sep 17 00:00:00 2001 From: zml2008 Date: Mon, 26 Dec 2011 16:28:51 -0800 Subject: [PATCH] Fixed a NPE in WorldEdit.getSafeFile() when extensions is null. --- .../java/com/sk89q/worldedit/WorldEdit.java | 3 +- .../worldedit/bukkit/WorldEditCommand.java | 47 ------------------- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 src/main/java/com/sk89q/worldedit/bukkit/WorldEditCommand.java diff --git a/src/main/java/com/sk89q/worldedit/WorldEdit.java b/src/main/java/com/sk89q/worldedit/WorldEdit.java index ef3ff1bb9..4eff18c76 100644 --- a/src/main/java/com/sk89q/worldedit/WorldEdit.java +++ b/src/main/java/com/sk89q/worldedit/WorldEdit.java @@ -718,7 +718,7 @@ public class WorldEdit { private File getSafeFile(LocalPlayer player, File dir, String filename, String defaultExt, String[] extensions, boolean isSave) throws FilenameException { - if (extensions.length == 1 && extensions[0] == null) extensions = null; + if (extensions != null && (extensions.length == 1 && extensions[0] == null)) extensions = null; File f; @@ -1258,6 +1258,7 @@ public class WorldEdit { } catch (WrappedCommandException e) { throw e.getCause(); } catch (UnhandledCommandException e) { + player.printError("Command could not be handled; invalid sender!"); return false; } finally { session.remember(editSession); diff --git a/src/main/java/com/sk89q/worldedit/bukkit/WorldEditCommand.java b/src/main/java/com/sk89q/worldedit/bukkit/WorldEditCommand.java deleted file mode 100644 index 5371defe9..000000000 --- a/src/main/java/com/sk89q/worldedit/bukkit/WorldEditCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -// $Id$ -/* - * WorldEdit - * Copyright (C) 2010 sk89q and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -package com.sk89q.worldedit.bukkit; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.bukkit.command.CommandSender; -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandPermissions; - -public class WorldEditCommand extends org.bukkit.command.Command { - - public WorldEditCommand(Command command, CommandPermissions commandPermissions) { - super(command.aliases()[0]); - this.description = command.desc(); - this.usageMessage = "/"+getName()+" "+command.usage(); - - List aliases = new ArrayList(Arrays.asList(command.aliases())); - aliases.remove(0); - this.setAliases(aliases); - } - - @Override - public boolean execute(CommandSender sender, String currentAlias, String[] args) { - // This method is never called. - return true; - } -}