summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-27 07:47:16 +0100
committersnowleo <schneeleo@gmail.com>2011-11-27 07:47:16 +0100
commit41e8c4c7b874974088ffe8b33495f2206046c20f (patch)
treef451069cdc8021d2020cecae935017d0c37a1449
parenta8a72da15e71ec62032d6fbfb1f219ea03a00d6a (diff)
downloadEssentials-41e8c4c7b874974088ffe8b33495f2206046c20f.tar
Essentials-41e8c4c7b874974088ffe8b33495f2206046c20f.tar.gz
Essentials-41e8c4c7b874974088ffe8b33495f2206046c20f.tar.lz
Essentials-41e8c4c7b874974088ffe8b33495f2206046c20f.tar.xz
Essentials-41e8c4c7b874974088ffe8b33495f2206046c20f.zip
Enchantments on Trade signs? Fixes check, so we won't add items that are enchanted.
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignTrade.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
index 7a7031758..4b6e4395c 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
@@ -4,7 +4,7 @@ import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*;
import org.bukkit.inventory.ItemStack;
-
+//TODO: Sell Enchantment on Trade signs?
public class SignTrade extends EssentialsSign
{
public SignTrade()
@@ -70,7 +70,8 @@ public class SignTrade extends EssentialsSign
final Trade trade = getTrade(sign, 2, false, false, ess);
if (trade.getItemStack() != null && player.getItemInHand() != null
&& trade.getItemStack().getTypeId() == player.getItemInHand().getTypeId()
- && trade.getItemStack().getDurability() == player.getItemInHand().getDurability())
+ && trade.getItemStack().getDurability() == player.getItemInHand().getDurability()
+ && trade.getItemStack().getEnchantments().equals(player.getItemInHand().getEnchantments()))
{
int amount = player.getItemInHand().getAmount();
amount -= amount % trade.getItemStack().getAmount();