From e08cc845a2cac2839b882687cadf0ee46e600bd9 Mon Sep 17 00:00:00 2001 From: Darkere Date: Thu, 15 Oct 2020 12:46:19 +0200 Subject: [PATCH] Fix crash on shift scroll up on servers (#2708) * fix server crash on shift scroll up * don't compare quantity * newline o.o * changelog --- CHANGELOG.md | 3 +++ .../apiimpl/network/grid/handler/ItemGridHandler.java | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 782f02396..c5994925c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Refined Storage Changelog +### 1.9.8 +- Fixed server crash when scrolling in Grid (Darkere) + ### 1.9.7 - Added functionality to move items in the Grid with shift/ctrl + scrolling (Darkere) - Changed JEI transfer error mechanics (raoulvdberge) diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 8453cad9d..2ad4dd686 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -321,9 +321,11 @@ public class ItemGridHandler implements IItemGridHandler { return; } - int slot = player.inventory.getSlotFor(cache.getList().get(id)); - if (slot != -1) { - gridHandler.onInsert(player, player.inventory.getStackInSlot(slot), true); + for (int i = 0; i < player.inventory.mainInventory.size(); i++) { + if (API.instance().getComparer().isEqual(player.inventory.getStackInSlot(i), cache.getList().get(id), IComparer.COMPARE_NBT)) { + gridHandler.onInsert(player, player.inventory.getStackInSlot(i), true); + break; + } } } else { //scroll down, extract hovering item