diff options
| author | miozune <miozune@gmail.com> | 2023-06-06 14:57:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 07:57:10 +0200 |
| commit | 6b619fc2e0f57e04796da10911047635e7d9a6a0 (patch) | |
| tree | ff0d152889148eccc12f3aa69303b018ba6c0115 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 185f63c02367fae0b3cbbc23bb90906cd34425c2 (diff) | |
| download | GT5-Unofficial-6b619fc2e0f57e04796da10911047635e7d9a6a0.tar.gz GT5-Unofficial-6b619fc2e0f57e04796da10911047635e7d9a6a0.tar.bz2 GT5-Unofficial-6b619fc2e0f57e04796da10911047635e7d9a6a0.zip | |
Fix fluid lock issues (#2062)
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index 8d65c429f7..6c46600f94 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -150,7 +150,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); aNBT.setByte("mMode", mMode); - if (lockedFluidName != null && lockedFluidName.length() != 0) + if (isFluidLocked() && lockedFluidName != null && lockedFluidName.length() != 0) aNBT.setString("lockedFluidName", lockedFluidName); else aNBT.removeTag("lockedFluidName"); } @@ -159,8 +159,10 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); mMode = aNBT.getByte("mMode"); - lockedFluidName = aNBT.getString("lockedFluidName"); - lockedFluidName = lockedFluidName.length() == 0 ? null : lockedFluidName; + if (isFluidLocked()) { + lockedFluidName = aNBT.getString("lockedFluidName"); + } + lockedFluidName = GT_Utility.isStringInvalid(lockedFluidName) ? null : lockedFluidName; } @Override @@ -393,6 +395,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch } } else { this.mMode = 0; + setLockedFluidName(null); markDirty(); } } |