diff --git a/MobArena.jar b/MobArena.jar index 38b1170..dfa5e74 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/resources/plugin.yml b/resources/plugin.yml index 5608139..eff6884 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.94.4 +version: 0.94.4.1 softdepend: [Spout,Permissions,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells] commands: ma: diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index 8e1da48..182b491 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -597,12 +597,19 @@ public class MAUtils if (material == Material.INK_SACK) offset = 15; - DyeColor dye = (data.matches("[0-9]+")) ? - DyeColor.getByData((byte) Math.abs(offset - Integer.parseInt(data))) : - DyeColor.valueOf(data.toUpperCase()); - - //return new ItemStack(material, amount, (byte) Math.abs((offset - dye.getData()))); - return new ItemStack(material, amount, (byte) Math.abs(offset - dye.getData())); + if (material == Material.INK_SACK || material == Material.WOOL) + { + DyeColor dye = (data.matches("[0-9]+")) ? + DyeColor.getByData((byte) Math.abs(offset - Integer.parseInt(data))) : + DyeColor.valueOf(data.toUpperCase()); + + //return new ItemStack(material, amount, (byte) Math.abs((offset - dye.getData()))); + return new ItemStack(material, amount, (byte) Math.abs(offset - dye.getData())); + } + else + { + return new ItemStack(material, amount, (byte) Integer.parseInt(data)); + } } catch (Exception e) {