diff --git a/gradle.properties b/gradle.properties index 14d250666..547e236b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 trousers=trousers_edition -trousersversion=v49r +trousersversion=v49s ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java index c6fcca914..32d369245 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java +++ b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java @@ -192,7 +192,20 @@ public class PacketInventoryAction extends AppEngPacket } else if( this.action == InventoryAction.PLACE_JEI_GHOST_ITEM ) { - if( sender.openContainer.inventorySlots.get( this.slot ) instanceof SlotFake ) + if( sender.openContainer instanceof ContainerFluidConfigurable ) + { + if( this.slotItem != null ) + { + IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() ); + if( aefs != null ) + { + aefs.setStackSize( 1000 ); + ( (ContainerFluidConfigurable) sender.openContainer ).getFluidConfigInventory().setFluidInSlot( this.slot, aefs ); + NetworkHandler.instance().sendToServer( new PacketFluidSlot( Collections.singletonMap( this.slot, aefs ) ) ); + } + } + } + else if( this.slot < sender.openContainer.inventorySlots.size() && sender.openContainer.inventorySlots.get( this.slot ) instanceof SlotFake ) { if( this.slotItem != null ) { @@ -217,20 +230,6 @@ public class PacketInventoryAction extends AppEngPacket AELog.debug( e ); } } - - if( sender.openContainer instanceof ContainerFluidConfigurable ) - { - if( this.slotItem != null ) - { - IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() ); - if( aefs != null ) - { - aefs.setStackSize( 1000 ); - ( (ContainerFluidConfigurable) sender.openContainer ).getFluidConfigInventory().setFluidInSlot( this.slot, aefs ); - NetworkHandler.instance().sendToServer( new PacketFluidSlot( Collections.singletonMap( this.slot, aefs ) ) ); - } - } - } } else {