mirror/Essentials
2
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-03-07 12:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use strict comparison for potions in trade signs (#5260)

Browse Source
This commit is contained in:
Josh Roy 2023-04-02 17:45:46 -04:00 committed by GitHub
parent bf14b88600
commit 0f4af9e735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java
View File

@ -87,6 +87,9 @@ public class SignTrade extends EssentialsSign {
final Trade trade = getTrade(sign, 2, AmountType.COST, false, true, ess);
ItemStack stack = Inventories.getItemInHand(player.getBase());
if (trade.getItemStack() != null && stack != null && !MaterialUtil.isAir(stack.getType()) && trade.getItemStack().getType() == stack.getType() && MaterialUtil.getDamage(trade.getItemStack()) == MaterialUtil.getDamage(stack) && trade.getItemStack().getEnchantments().equals(stack.getEnchantments())) {
if (MaterialUtil.isPotion(trade.getItemStack().getType()) && !trade.getItemStack().isSimilar(stack)) {
return null;
}
final int amount = trade.getItemStack().getAmount();
if (Inventories.containsAtLeast(player.getBase(), trade.getItemStack(), amount)) {
stack = stack.clone();