summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorWesley Wolfe <wesley.d.wolfe+git@gmail.com>2014-06-03 15:39:01 -0500
committerWesley Wolfe <wesley.d.wolfe+git@gmail.com>2014-06-03 16:09:47 -0500
commitf93e9fc7b7711bc212e8feb12a4faad16bb2560c (patch)
tree72f072461bc4169cd9671c3587efbd3ab7d92856 /src/main/java
parent9869166c2ee9ec6911eae1934a2e048ea624565e (diff)
downloadbukkit-f93e9fc7b7711bc212e8feb12a4faad16bb2560c.tar
bukkit-f93e9fc7b7711bc212e8feb12a4faad16bb2560c.tar.gz
bukkit-f93e9fc7b7711bc212e8feb12a4faad16bb2560c.tar.lz
bukkit-f93e9fc7b7711bc212e8feb12a4faad16bb2560c.tar.xz
bukkit-f93e9fc7b7711bc212e8feb12a4faad16bb2560c.zip
Fix failing BukkitMirrorTest
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/Bukkit.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f61270ab..dafea2e6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -10,6 +10,7 @@ import java.util.UUID;
import java.util.logging.Logger;
import org.bukkit.Warning.WarningState;
+import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
@@ -19,6 +20,7 @@ import org.bukkit.help.HelpMap;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemFactory;
import org.bukkit.inventory.Recipe;
import org.bukkit.map.MapView;
import org.bukkit.plugin.PluginManager;
@@ -29,7 +31,6 @@ import org.bukkit.scoreboard.ScoreboardManager;
import org.bukkit.util.CachedServerIcon;
import com.avaje.ebean.config.ServerConfig;
-import org.bukkit.inventory.ItemFactory;
/**
* 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)
*/
- public static boolean dispatchCommand(CommandSender sender, String commandLine) {
+ public static boolean dispatchCommand(CommandSender sender, String commandLine) throws CommandException {
return server.dispatchCommand(sender, commandLine);
}
@@ -601,7 +602,7 @@ public final class Bukkit {
/**
* @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);
}
@@ -609,7 +610,7 @@ public final class Bukkit {
* @see Server#createInventory(InventoryHolder owner, int size, String
* 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);
}
@@ -700,14 +701,14 @@ public final class Bukkit {
/**
* @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);
}
/**
* @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);
}