aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-04-09 14:54:07 +0900
committerGitHub <noreply@github.com>2022-04-09 07:54:07 +0200
commitca6b6e89fbae3bc1b5dc45ab1025021689460a3f (patch)
tree40d4c5de747328fe72333be69b47998139b5d0f2 /src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
parente6cf6d0941cacc82f496a89d93be30fd2fc360f6 (diff)
downloadGT5-Unofficial-ca6b6e89fbae3bc1b5dc45ab1025021689460a3f.tar.gz
GT5-Unofficial-ca6b6e89fbae3bc1b5dc45ab1025021689460a3f.tar.bz2
GT5-Unofficial-ca6b6e89fbae3bc1b5dc45ab1025021689460a3f.zip
Allow using FluidDisplay stack to lock fluid in output hatch (#1015)
Diffstat (limited to 'src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java')
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
index 5c7eacd701..43a1d87a86 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
@@ -72,7 +72,11 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
if (gui instanceof GT_GUIContainer_OutputHatch && ((GT_GUIContainer_OutputHatch) gui).isMouseOverSlot(3, mousex, mousey)) {
// the instanceof check should be unnecessary, but we will do it regardless, just in case.
- FluidStack tFluidStack = GT_Utility.getFluidForFilledItem(draggedStack, true);
+ FluidStack tFluidStack;
+ tFluidStack = GT_Utility.getFluidForFilledItem(draggedStack, true);
+ if (tFluidStack == null) {
+ tFluidStack = GT_Utility.getFluidFromDisplayStack(draggedStack);
+ }
if (tFluidStack != null) {
GT_Values.NW.sendToServer(new GT_Packet_SetLockedFluid(((GT_GUIContainer_OutputHatch) gui).mContainer.mTileEntity, tFluidStack));
return true;