diff options
| author | Батьків Нестор-Євген Васильович <batkivnestor@gmail.com> | 2023-12-20 19:13:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 18:13:59 +0100 |
| commit | e04e9665ede0a1888cd632030c2c1dbd73729f15 (patch) | |
| tree | 951f2deac4e12ac50f0c22ac38668b2b51473b42 /src/main/java | |
| parent | f1b0e6c22d0d60fdc883619ad9c3c3a1aafd6fe1 (diff) | |
| download | GT5-Unofficial-e04e9665ede0a1888cd632030c2c1dbd73729f15.tar.gz GT5-Unofficial-e04e9665ede0a1888cd632030c2c1dbd73729f15.tar.bz2 GT5-Unofficial-e04e9665ede0a1888cd632030c2c1dbd73729f15.zip | |
Fix CAL Locking itself (#381)
* Fix CAL Locking itself
* Update GT_TileEntity_CircuitAssemblyLine.java
Fix null
* I did the funny
Former-commit-id: bf835f2b3cd559b542fb54873b025be4adedfc43
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java index 3a24907884..68d7f48e12 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java @@ -237,8 +237,8 @@ public class GT_TileEntity_CircuitAssemblyLine extends @Override public void loadNBTData(NBTTagCompound aNBT) { this.type = aNBT.getCompoundTag(IMPRINT_KEY); - this.imprintedItemName = GT_LanguageManager - .getTranslateableItemStackName(ItemStack.loadItemStackFromNBT(this.type)); + this.imprintedItemName = this.type == null ? "" + : GT_LanguageManager.getTranslateableItemStackName(ItemStack.loadItemStackFromNBT(this.type)); mode = aNBT.getInteger(RUNNING_MODE_KEY); length = aNBT.getInteger(LENGTH_KEY); super.loadNBTData(aNBT); @@ -562,7 +562,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends @Override public boolean isRecipeLockingEnabled() { - return this.imprintedItemName != null && !"".equals(this.imprintedItemName); + return this.mode == 0 && this.imprintedItemName != null && !"".equals(this.imprintedItemName); } @Override |