Fix failing BukkitMirrorTest

By: Wesley Wolfe <wesley.d.wolfe+git@gmail.com>
This commit is contained in:
Bukkit/Spigot 2014-06-03 15:39:01 -05:00
parent b4b7429f5b
commit 9a3633a13f

View file

@ -10,6 +10,7 @@ import java.util.UUID;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Warning.WarningState; import org.bukkit.Warning.WarningState;
import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand; import org.bukkit.command.PluginCommand;
@ -19,6 +20,7 @@ import org.bukkit.help.HelpMap;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemFactory;
import org.bukkit.inventory.Recipe; import org.bukkit.inventory.Recipe;
import org.bukkit.map.MapView; import org.bukkit.map.MapView;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
@ -29,7 +31,6 @@ import org.bukkit.scoreboard.ScoreboardManager;
import org.bukkit.util.CachedServerIcon; import org.bukkit.util.CachedServerIcon;
import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.ServerConfig;
import org.bukkit.inventory.ItemFactory;
/** /**
* Represents the Bukkit core, for version and Server singleton handling * Represents the Bukkit core, for version and Server singleton handling
@ -312,7 +313,7 @@ public final class Bukkit {
/** /**
* @see Server#dispatchCommand(CommandSender sender, String commandLine) * @see Server#dispatchCommand(CommandSender sender, String commandLine)
*/ */
public static boolean dispatchCommand(CommandSender sender, String commandLine) { public static boolean dispatchCommand(CommandSender sender, String commandLine) throws CommandException {
return server.dispatchCommand(sender, commandLine); return server.dispatchCommand(sender, commandLine);
} }
@ -601,7 +602,7 @@ public final class Bukkit {
/** /**
* @see Server#createInventory(InventoryHolder owner, int size) * @see Server#createInventory(InventoryHolder owner, int size)
*/ */
public static Inventory createInventory(InventoryHolder owner, int size) { public static Inventory createInventory(InventoryHolder owner, int size) throws IllegalArgumentException {
return server.createInventory(owner, size); return server.createInventory(owner, size);
} }
@ -609,7 +610,7 @@ public final class Bukkit {
* @see Server#createInventory(InventoryHolder owner, int size, String * @see Server#createInventory(InventoryHolder owner, int size, String
* title) * title)
*/ */
public static Inventory createInventory(InventoryHolder owner, int size, String title) { public static Inventory createInventory(InventoryHolder owner, int size, String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title); return server.createInventory(owner, size, title);
} }
@ -700,14 +701,14 @@ public final class Bukkit {
/** /**
* @see Server#loadServerIcon(File) * @see Server#loadServerIcon(File)
*/ */
public static CachedServerIcon loadServerIcon(File file) throws Exception { public static CachedServerIcon loadServerIcon(File file) throws IllegalArgumentException, Exception {
return server.loadServerIcon(file); return server.loadServerIcon(file);
} }
/** /**
* @see Server#loadServerIcon(BufferedImage) * @see Server#loadServerIcon(BufferedImage)
*/ */
public static CachedServerIcon loadServerIcon(BufferedImage image) throws Exception { public static CachedServerIcon loadServerIcon(BufferedImage image) throws IllegalArgumentException, Exception {
return server.loadServerIcon(image); return server.loadServerIcon(image);
} }