From 21040b306ac8a34360102da926371bd6fd431c3d Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 31 Jan 2011 14:35:46 -0800 Subject: [PATCH] Updated for ItemStack change in Bukkit. --- src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java | 2 +- src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java | 2 +- src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index 2d3483ab..03342f1d 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -65,7 +65,7 @@ public void onBlockDamage(BlockDamageEvent event) { if (!plugin.itemDurability && event.getDamageLevel() == BlockDamageLevel.BROKEN) { ItemStack held = player.getItemInHand(); if (held.getTypeId() > 0) { - held.setDamage((byte)-1); + held.setDurability((short) -1); player.setItemInHand(held); } } diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index 2af5caf0..a9056f57 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -100,7 +100,7 @@ public void onPlayerItem(PlayerItemEvent event) { if (!plugin.itemDurability) { // Hoes if (item.getTypeId() >= 290 && item.getTypeId() <= 294) { - item.setDamage((byte)-1); + item.setDurability((byte)-1); player.setItemInHand(item); } } diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index 2f713c4a..59caed56 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -625,7 +625,7 @@ private boolean handleCommand(Player player, String cmd, String[] args) // Blocks store their color in the damage value if (item2.getTypeId() == item.getTypeId() && (!ItemType.usesDamageValue(item.getTypeId()) - || item.getDamage() == item2.getDamage())) { + || item.getDurability() == item2.getDurability())) { // This stack won't fit in the parent stack if (item2.getAmount() > needed) { item.setAmount(64);