Update to Bukkit for 1.7.9

GlowstoneMC · May 15, 2014 · 90c8c56 · 90c8c56
1 parent 9b5721c
commit 90c8c56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ def gitDescribe() {
         // determine git-describe output
         def stdout = new ByteArrayOutputStream()
         exec {
-            commandLine 'git', 'describe', '--always'
+            commandLine 'git', 'describe', '--always', '--dirty=*'
             standardOutput = stdout
         }
         return stdout.toString().trim()
@@ -51,7 +51,7 @@ mainClassName = "net.glowstone.GlowServer"
 
 // Extended project information
 ext.url = 'https://github.com/SpaceManiac/Glowstone'
-ext.bukkitVersion = '1.7.2-R0.3'
+ext.bukkitVersion = '1.7.9-R0.1'
 ext.gitDescribe = getVersionName()
 
 // Minimum Java version required

diff --git a/src/main/java/net/glowstone/GlowServer.java b/src/main/java/net/glowstone/GlowServer.java
@@ -58,7 +58,7 @@ public final class GlowServer implements Server {
     /**
      * The game version supported by the server.
      */
-    public static final String GAME_VERSION = "1.7.8";
+    public static final String GAME_VERSION = "1.7.9";
 
     /**
      * The protocol version supported by the server.
@@ -937,12 +937,10 @@ public GlowMapView createMap(World world) {
     ////////////////////////////////////////////////////////////////////////////
     // Inventory and crafting
 
-    @Override
     public List<Recipe> getRecipesFor(ItemStack result) {
         return craftingManager.getRecipesFor(result);
     }
 
-    @Override
     public Iterator<Recipe> recipeIterator() {
         return craftingManager.iterator();
     }
@@ -951,31 +949,30 @@ public boolean addRecipe(Recipe recipe) {
         return craftingManager.addRecipe(recipe);
     }
 
-    @Override
     public void clearRecipes() {
         craftingManager.clearRecipes();
     }
 
-    @Override
     public void resetRecipes() {
         craftingManager.resetRecipes();
     }
 
-    @Override
     public Inventory createInventory(InventoryHolder owner, InventoryType type) {
         return new GlowInventory(owner, type);
     }
 
-    @Override
     public Inventory createInventory(InventoryHolder owner, int size) {
         return new GlowInventory(owner, InventoryType.CHEST, size);
     }
 
-    @Override
     public Inventory createInventory(InventoryHolder owner, int size, String title) {
         return new GlowInventory(owner, InventoryType.CHEST, size, title);
     }
 
+    public Inventory createInventory(InventoryHolder owner, InventoryType type, String title) {
+        return new GlowInventory(owner, type, type.getDefaultSize(), title);
+    }
+
     ////////////////////////////////////////////////////////////////////////////
     // Server icons
 

diff --git a/src/main/java/net/glowstone/entity/GlowPlayer.java b/src/main/java/net/glowstone/entity/GlowPlayer.java
@@ -937,19 +937,19 @@ public boolean performCommand(String command) {
 
     public void chat(String text) {
         if (text.startsWith("/")) {
+            server.getLogger().info(getName() + " issued command: " + text);
             try {
                 PlayerCommandPreprocessEvent event = EventFactory.onPlayerCommand(this, text);
                 if (event.isCancelled()) {
                     return;
                 }
-
-                server.getLogger().info(event.getPlayer().getName() + " issued command: " + event.getMessage());
                 getServer().dispatchCommand(event.getPlayer(), event.getMessage().substring(1));
             } catch (Exception ex) {
                 sendMessage(ChatColor.RED + "An internal error occured while executing your command.");
                 getServer().getLogger().log(Level.SEVERE, "Exception while executing command: " + text, ex);
             }
         } else {
+            // todo: async this
             PlayerChatEvent event = EventFactory.onPlayerChat(this, text);
             if (event.isCancelled()) {
                 return;