diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-03-12 09:00:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 09:00:57 +0100 |
| commit | 53e7cf1b646b70fed04c8a9fe69f830286c879a2 (patch) | |
| tree | 8de8200261538b45b4b2322fefc91d9647552916 | |
| parent | 2d7fe3783011c605a90cf48c04bb575e0e75a72b (diff) | |
| parent | 64249330a073f0e3921a9335b71faa9eda9e351a (diff) | |
| download | GT5-Unofficial-53e7cf1b646b70fed04c8a9fe69f830286c879a2.tar.gz GT5-Unofficial-53e7cf1b646b70fed04c8a9fe69f830286c879a2.tar.bz2 GT5-Unofficial-53e7cf1b646b70fed04c8a9fe69f830286c879a2.zip | |
Merge pull request #461 from repo-alt/experimental
Correctly release/reuse channel after ME bus removal and reconnect
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 9fd8e75754..5e9715493b 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -927,12 +927,12 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE tileEntityInvalid = false; leaveEnet(); if (canAccessData()) { + if (GregTech_API.mAE2) + invalidateAE(); mMetaTileEntity.onRemoval(); mMetaTileEntity.setBaseMetaTileEntity(null); } super.invalidate(); - if (GregTech_API.mAE2) - invalidateAE(); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java index 34f99510ea..910ad73d65 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java @@ -54,6 +54,12 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc return new ITexture[]{aBaseTexture, new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ME_HATCH)}; } + @Override + public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { + super.onFirstTick(aBaseMetaTileEntity); + getProxy(); + } + @Optional.Method(modid = "appliedenergistics2") public int store(final ItemStack stack) { if (stack == null) |