diff --git a/translators/translator-v390ee_to_v408be/src/main/java/au/com/grieve/reversion/translators/v390ee_to_v408be/handlers/PlayerActionHandlerHandler_v390ee_to_v408be.java b/translators/translator-v390ee_to_v408be/src/main/java/au/com/grieve/reversion/translators/v390ee_to_v408be/handlers/PlayerActionHandlerHandler_v390ee_to_v408be.java index 7b5737e..2e64117 100644 --- a/translators/translator-v390ee_to_v408be/src/main/java/au/com/grieve/reversion/translators/v390ee_to_v408be/handlers/PlayerActionHandlerHandler_v390ee_to_v408be.java +++ b/translators/translator-v390ee_to_v408be/src/main/java/au/com/grieve/reversion/translators/v390ee_to_v408be/handlers/PlayerActionHandlerHandler_v390ee_to_v408be.java @@ -38,17 +38,19 @@ public PlayerActionHandlerHandler_v390ee_to_v408be(BedrockTranslator translator) public boolean fromUpstream(PlayerActionPacket packet) { super.fromUpstream(packet); - InventoryTransactionHandler_v390ee_to_v408be ith = (InventoryTransactionHandler_v390ee_to_v408be) getTranslator().getHandlers().get(InventoryTransactionPacket.class); - - // If ith has a penderItemUse with the same location as this we will handle it ourself - InventoryTransactionHandler_v390ee_to_v408be.PendingUseItem pending = ith.getPendingUseItems().stream() - .filter(i -> i.getFirstPacket().getBlockPosition().equals(packet.getBlockPosition())) - .findFirst() - .orElse(null); - - if (pending != null) { - pending.setActionPacket(packet); - return true; + if (packet.getBlockPosition() != null) { + InventoryTransactionHandler_v390ee_to_v408be ith = (InventoryTransactionHandler_v390ee_to_v408be) getTranslator().getHandlers().get(InventoryTransactionPacket.class); + + // If ith has a pendingItemUse with the same location as this we will handle it ourself + InventoryTransactionHandler_v390ee_to_v408be.PendingUseItem pending = ith.getPendingUseItems().stream() + .filter(i -> i.getFirstPacket().getBlockPosition().equals(packet.getBlockPosition())) + .findFirst() + .orElse(null); + + if (pending != null) { + pending.setActionPacket(packet); + return true; + } } return false;