summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-07-06 16:40:06 +0100
committerKHobbits <rob@khobbits.co.uk>2014-07-06 16:40:06 +0100
commit2ba2ebaa43affee3bdd17f5aa66b7d8688cb5782 (patch)
tree27dce6f02294bd6bfaad778bfc89c9ecb9533edc
parent549500eaf2f56229d4f4603edadc55993396ae2d (diff)
downloadEssentials-2ba2ebaa43affee3bdd17f5aa66b7d8688cb5782.tar
Essentials-2ba2ebaa43affee3bdd17f5aa66b7d8688cb5782.tar.gz
Essentials-2ba2ebaa43affee3bdd17f5aa66b7d8688cb5782.tar.lz
Essentials-2ba2ebaa43affee3bdd17f5aa66b7d8688cb5782.tar.xz
Essentials-2ba2ebaa43affee3bdd17f5aa66b7d8688cb5782.zip
Update Bukkit
CB: 3092 B: 1938
-rw-r--r--Essentials/test/com/earth2me/essentials/FakeServer.java6
-rw-r--r--lib/bukkit.jarbin4940692 -> 4948889 bytes
-rw-r--r--lib/craftbukkit.jarbin20450394 -> 20453584 bytes
3 files changed, 6 insertions, 0 deletions
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index 871f01211..ca989f21a 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -1078,6 +1078,12 @@ public class FakeServer implements Server
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
+ public Inventory createInventory(InventoryHolder arg0, InventoryType arg1, String arg2)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
class FakePluginManager implements PluginManager
{
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
index b5ad9ba6a..9b8f8bae2 100644
--- a/lib/bukkit.jar
+++ b/lib/bukkit.jar
Binary files differ
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index 8938cbcc4..b7cd2968d 100644
--- a/lib/craftbukkit.jar
+++ b/lib/craftbukkit.jar
Binary files differ