Fixed "Extracting Certain Items Breaking Most World Interactions". Fixes #2055

This commit is contained in:
raoulvdberge
2018-10-27 19:57:07 +02:00
parent 8cb38fe528
commit ec0964248c
2 changed files with 12 additions and 7 deletions

View File

@@ -3,6 +3,7 @@
### 1.6.9 ### 1.6.9
- Fixed OpenComputers "unknown error" when using extract item API (raoulvdberge) - Fixed OpenComputers "unknown error" when using extract item API (raoulvdberge)
- Fixed client FPS stuttering when opening a Crafting Grid (raoulvdberge) - Fixed client FPS stuttering when opening a Crafting Grid (raoulvdberge)
- Fixed rare Grid crashing issue (raoulvdberge)
### 1.6.8 ### 1.6.8
- Fixed Ender IO incompatibility (raoulvdberge) - Fixed Ender IO incompatibility (raoulvdberge)

View File

@@ -90,18 +90,22 @@ public class ItemGridHandler implements IItemGridHandler {
if (ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) { if (ItemHandlerHelper.insertItem(playerInventory, took, true).isEmpty()) {
took = network.extractItem(item, size, Action.PERFORM); took = network.extractItem(item, size, Action.PERFORM);
ItemHandlerHelper.insertItem(playerInventory, took, false); if (took != null) {
ItemHandlerHelper.insertItem(playerInventory, took, false);
}
} }
} else { } else {
took = network.extractItem(item, size, Action.PERFORM); took = network.extractItem(item, size, Action.PERFORM);
if (single && !held.isEmpty()) { if (took != null) {
held.grow(1); if (single && !held.isEmpty()) {
} else { held.grow(1);
player.inventory.setItemStack(took); } else {
} player.inventory.setItemStack(took);
}
player.updateHeldItem(); player.updateHeldItem();
}
} }
INetworkItem networkItem = network.getNetworkItemHandler().getItem(player); INetworkItem networkItem = network.getNetworkItemHandler().getItem(player);