aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatej Dipčár <492666@mail.muni.cz>2022-09-21 14:15:12 +0200
committerMatej Dipčár <492666@mail.muni.cz>2022-09-23 02:15:48 +0200
commitcc5a1189c04cfb7ccc0ae29d9e104c729ac8802b (patch)
tree3835080905006804486ec802d5617d1b102b0f17
parent2911e1e68afa0db6e615aca4b79b012bd6e08936 (diff)
downloadGT5-Unofficial-cc5a1189c04cfb7ccc0ae29d9e104c729ac8802b.tar.gz
GT5-Unofficial-cc5a1189c04cfb7ccc0ae29d9e104c729ac8802b.tar.bz2
GT5-Unofficial-cc5a1189c04cfb7ccc0ae29d9e104c729ac8802b.zip
Unregister signal also when TE is destroyed
-rw-r--r--src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
index e5f615e329..0d95263fa3 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
@@ -36,15 +36,24 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase extends GT_Cover_
return createDataObject();
}
+ private static void unregisterSignal(byte aSide, TransmitterData aCoverVariable, ICoverable aTileEntity) {
+ long hash = GregTech_API.hashCoverCoords(aTileEntity, aSide);
+ GregTech_API.removeAdvancedRedstone(aCoverVariable.uuid, aCoverVariable.frequency, hash);
+ }
+
@Override
public boolean onCoverRemovalImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity,
boolean aForced) {
- long hash = GregTech_API.hashCoverCoords(aTileEntity, aSide);
- GregTech_API.removeAdvancedRedstone(aCoverVariable.uuid, aCoverVariable.frequency, hash);
+ unregisterSignal(aSide, aCoverVariable, aTileEntity);
return true;
}
@Override
+ protected void onBaseTEDestroyedImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) {
+ unregisterSignal(aSide, aCoverVariable, aTileEntity);
+ }
+
+ @Override
public String getDescriptionImpl(byte aSide, int aCoverID, TransmitterData aCoverVariable, ICoverable aTileEntity) {
return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency + ", Transmission: " + (aCoverVariable.uuid == null ? "Public" : "Private");
}