From 0290305b2359597359db95744a5b745c77e4bfd2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 5 Aug 2012 14:49:01 +1000 Subject: [PATCH] Bump to 1.56 and invert container ordering --- src/main/java/de/diddiz/util/BukkitUtils.java | 12 ++++++------ src/main/resources/plugin.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/diddiz/util/BukkitUtils.java b/src/main/java/de/diddiz/util/BukkitUtils.java index 32a3c0b..fc7570c 100644 --- a/src/main/java/de/diddiz/util/BukkitUtils.java +++ b/src/main/java/de/diddiz/util/BukkitUtils.java @@ -37,20 +37,20 @@ public class BukkitUtils } public static int getInventoryHolderType(InventoryHolder holder) { - if (holder instanceof BlockState) { - return ((BlockState)holder).getTypeId(); - } else if (holder instanceof DoubleChest) { + if (holder instanceof DoubleChest) { return ((DoubleChest)holder).getLocation().getBlock().getTypeId(); + } else if (holder instanceof BlockState) { + return ((BlockState)holder).getTypeId(); } else { return -1; } } public static Location getInventoryHolderLocation(InventoryHolder holder) { - if (holder instanceof BlockState) { - return ((BlockState)holder).getLocation(); - } else if (holder instanceof DoubleChest) { + if (holder instanceof DoubleChest) { return ((DoubleChest)holder).getLocation(); + } else if (holder instanceof BlockState) { + return ((BlockState)holder).getLocation(); } else { return null; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c295055..2189d35 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ${project.name} -version: '1.55' +version: '1.56' author: DiddiZ website: http://www.diddiz.de/minecraft/ main: de.diddiz.LogBlock.LogBlock