mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-14 22:23:42 +01:00
check funnel first to fix bug
This commit is contained in:
parent
a666f24ee0
commit
f0305d7027
1 changed files with 11 additions and 10 deletions
|
@ -58,10 +58,10 @@ public class BeltInventory {
|
|||
belt.setChanged();
|
||||
belt.sendData();
|
||||
}
|
||||
|
||||
|
||||
if (belt.getSpeed() == 0)
|
||||
return;
|
||||
|
||||
|
||||
// Reverse item collection if belt just reversed
|
||||
if (beltMovementPositive != belt.getDirectionAwareBeltMovementSpeed() > 0) {
|
||||
beltMovementPositive = !beltMovementPositive;
|
||||
|
@ -107,7 +107,7 @@ public class BeltInventory {
|
|||
// Don't move if held by processing (client)
|
||||
if (world.isClientSide && currentItem.locked)
|
||||
continue;
|
||||
|
||||
|
||||
// Don't move if held by external components
|
||||
if (currentItem.lockedExternally) {
|
||||
currentItem.lockedExternally = false;
|
||||
|
@ -149,7 +149,12 @@ public class BeltInventory {
|
|||
if (currentItem.locked)
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Belt Funnels
|
||||
if (BeltFunnelInteractionHandler.checkForFunnels(this, currentItem, nextOffset))
|
||||
continue;
|
||||
|
||||
if (noMovement)
|
||||
continue;
|
||||
|
||||
|
@ -157,10 +162,6 @@ public class BeltInventory {
|
|||
if (BeltTunnelInteractionHandler.flapTunnelsAndCheckIfStuck(this, currentItem, nextOffset))
|
||||
continue;
|
||||
|
||||
// Belt Funnels
|
||||
if (BeltFunnelInteractionHandler.checkForFunnels(this, currentItem, nextOffset))
|
||||
continue;
|
||||
|
||||
// Horizontal Crushing Wheels
|
||||
if (BeltCrusherInteractionHandler.checkForCrushers(this, currentItem, nextOffset))
|
||||
continue;
|
||||
|
@ -243,7 +244,7 @@ public class BeltInventory {
|
|||
belt.sendData();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (noMovement)
|
||||
return false;
|
||||
|
||||
|
@ -449,5 +450,5 @@ public class BeltInventory {
|
|||
public List<TransportedItemStack> getTransportedItems() {
|
||||
return items;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue