Upstream/CoreProtect
1
0
Fork 0
mirror of https://github.com/PlayPro/CoreProtect.git synced 2024-12-27 17:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NullPointerException when trading with wandering traders

Browse Source
This commit is contained in:
Intelli 2022-03-08 13:59:19 -07:00
parent 829f4e95d5
commit 975a030ebe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/coreprotect/listener/player/CraftItemListener.java
View File

@ -171,6 +171,7 @@ public final class CraftItemListener extends Queue implements Listener {
} }
if (addItem.getAmount() > 0) { if (addItem.getAmount() > 0) {
Location location = (isTrade || event.getInventory().getLocation() == null) ? player.getLocation() : event.getInventory().getLocation();
for (ItemStack oldItem : oldItems) { for (ItemStack oldItem : oldItems) {
if (oldItem == null || oldItem.getType() == Material.AIR) { if (oldItem == null || oldItem.getType() == Material.AIR) {
continue; continue;
@ -181,10 +182,10 @@ public final class CraftItemListener extends Queue implements Listener {
return; return;
} }
removedItem.setAmount(removedItem.getAmount() * amountMultiplier); removedItem.setAmount(removedItem.getAmount() * amountMultiplier);
logCraftedItem(event.getInventory().getLocation(), player.getName(), removedItem, isTrade ? ItemLogger.ITEM_SELL : ItemLogger.ITEM_DESTROY); logCraftedItem(location, player.getName(), removedItem, isTrade ? ItemLogger.ITEM_SELL : ItemLogger.ITEM_DESTROY);
} }
logCraftedItem(event.getInventory().getLocation(), player.getName(), addItem, isTrade ? ItemLogger.ITEM_BUY : ItemLogger.ITEM_CREATE); logCraftedItem(location, player.getName(), addItem, isTrade ? ItemLogger.ITEM_BUY : ItemLogger.ITEM_CREATE);
} }
} }