Skip to content

Commit 1293915

Browse files
committed
sike, no need to initialize
1 parent dd89b43 commit 1293915

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class GTFluidSyncHandler extends SyncHandler {
3535
public static final int LOCK_FLUID = 5;
3636

3737
private final IFluidTank tank;
38-
private DynamicValue<FluidStack> lockedFluid = new DynamicValue<>(() -> null, null);
38+
private DynamicValue<FluidStack> lockedFluid;
3939
private FluidStack lastFluid;
4040
private FluidStack phantomFluid;
4141
private boolean canDrainSlot = true;
@@ -157,10 +157,8 @@ public boolean showAmount() {
157157

158158
public @Nullable String getFluidLocalizedName() {
159159
var tankFluid = this.tank.getFluid();
160-
var lockedFluid = this.lockedFluid.getValue();
161-
162-
if (tankFluid == null && lockedFluid != null)
163-
return lockedFluid.getLocalizedName();
160+
if (tankFluid == null && canLockFluid())
161+
tankFluid = this.lockedFluid.getValue();
164162

165163
return tankFluid == null ? null : tankFluid.getLocalizedName();
166164
}
@@ -456,7 +454,7 @@ public FluidStack getPhantomFluid() {
456454
}
457455

458456
public FluidStack getLockedFluid() {
459-
return !isPhantom() ? lockedFluid.getValue() : null;
457+
return !isPhantom() && canLockFluid() ? lockedFluid.getValue() : null;
460458
}
461459

462460
public boolean canLockFluid() {

0 commit comments

Comments
 (0)