summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-06-20 21:14:28 +0100
committerKHobbits <rob@khobbits.co.uk>2013-06-20 21:14:28 +0100
commit8bbcf575b753713d7a190471e31b916ab6e2e5fd (patch)
treeff5d0f0305558ee1f6336f1ea41cfc4fb7ec726f
parentbe6e699d8611f5b9494a2b898c176254f539322c (diff)
downloadEssentials-8bbcf575b753713d7a190471e31b916ab6e2e5fd.tar
Essentials-8bbcf575b753713d7a190471e31b916ab6e2e5fd.tar.gz
Essentials-8bbcf575b753713d7a190471e31b916ab6e2e5fd.tar.lz
Essentials-8bbcf575b753713d7a190471e31b916ab6e2e5fd.tar.xz
Essentials-8bbcf575b753713d7a190471e31b916ab6e2e5fd.zip
Reduce restrictions on same item trading, so only identical items are blocked.
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignTrade.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
index 37501f1aa..4029be5b7 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java
@@ -32,7 +32,8 @@ public class SignTrade extends EssentialsSign
validateTrade(sign, 2, true, ess);
final Trade trade = getTrade(sign, 2, AmountType.ROUNDED, true, ess);
final Trade charge = getTrade(sign, 1, AmountType.ROUNDED, false, ess);
- if (trade.getType() == charge.getType() && (trade.getType() != TradeType.ITEM || trade.getItemStack().getType().equals(charge.getItemStack().getType())))
+ if (trade.getType() == charge.getType()
+ && (trade.getType() != TradeType.ITEM || trade.getItemStack().isSimilar(charge.getItemStack())))
{
throw new SignException("You cannot trade for the same item type.");
}