aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-05-06 08:13:45 -0700
committerGitHub <noreply@github.com>2023-05-06 17:13:45 +0200
commitd945860185b888709300e28ae1c9db88799856c0 (patch)
tree0d7e2766c98164d6ae915c0e8a9d8f46c7ceb4e5 /src/main/java/gregtech/common/covers/GT_Cover_Drain.java
parentf6e17a41972ba0afb6004a3d383be8d51eaee60e (diff)
downloadGT5-Unofficial-d945860185b888709300e28ae1c9db88799856c0.tar.gz
GT5-Unofficial-d945860185b888709300e28ae1c9db88799856c0.tar.bz2
GT5-Unofficial-d945860185b888709300e28ae1c9db88799856c0.zip
Exploring some various ForgeDirection fixes (#1950)
* Fix mFacing NPEs * Default facing fixes (#1945) * QuickFixes incomplete facing fixes * fix Neither UP nor DOWN conditions as offsetY == 0 is not valid test * fix neither up nor down again * Still not fixed: use ForgeDirection.flag for clarty killed more ordinal siding. * get ride of offset testing --------- Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Jason Mitchell <mitchej@gmail.com> * bit logic fix * Fix single block machine facings * Predict the machine facing direction clientside before the server packet arrives * Fix isFacingValid logic --------- Co-authored-by: Léa Gris <lea.gris@noiraude.net> Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Raven Szewczyk <git@eigenraven.me>
Diffstat (limited to 'src/main/java/gregtech/common/covers/GT_Cover_Drain.java')
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Drain.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
index 14b25e4777..92d1aca0d7 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
@@ -79,8 +79,9 @@ public class GT_Cover_Drain extends GT_CoverBehavior {
false);
}
if ((tLiquid != null) && (tLiquid.getFluid() != null)
- && ((side.ordinal() > 1) || ((side == ForgeDirection.DOWN) && (tLiquid.getFluid()
- .getDensity() <= 0))
+ && ((side.flag & (ForgeDirection.UP.flag | ForgeDirection.DOWN.flag)) == 0 // Horizontal
+ || ((side == ForgeDirection.DOWN) && (tLiquid.getFluid()
+ .getDensity() <= 0))
|| ((side == ForgeDirection.UP) && (tLiquid.getFluid()
.getDensity() >= 0)))
&& (((IFluidHandler) aTileEntity).fill(side, tLiquid, false) == tLiquid.amount)) {