aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2018-03-08 22:30:20 +1000
committerGitHub <noreply@github.com>2018-03-08 22:30:20 +1000
commit413e039c481273e3e1c60767047fba81a6609ef2 (patch)
treef6121ddf06a8de4b39a551f505fcb24757a7024f /src/Java/gtPlusPlus/xmod/gregtech/api
parent07fc01d79d647b9eb30479ec4ba50c9a2257f52f (diff)
parent6d48df5a67acd70d4116827fa7dba729c94b83b7 (diff)
downloadGT5-Unofficial-413e039c481273e3e1c60767047fba81a6609ef2.tar.gz
GT5-Unofficial-413e039c481273e3e1c60767047fba81a6609ef2.tar.bz2
GT5-Unofficial-413e039c481273e3e1c60767047fba81a6609ef2.zip
Merge pull request #229 from codewarrior0/rewrite-substation
Rewrite Power Substation's running logic
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 2643b0e9dd..098c5d03bc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -526,7 +526,7 @@ GT_MetaTileEntity_MultiBlockBase {
(GT_MetaTileEntity_Hatch_OutputBattery) aMetaTileEntity);
}
if (LoadedMods.TecTech){
- if (isThisHatchMultiDynamo()) {
+ if (isThisHatchMultiDynamo(aMetaTileEntity)) {
Logger.REFLECTION("Found isThisHatchMultiDynamo");
updateTexture(aTileEntity, aBaseCasingIndex);
return this.mMultiDynamoHatches.add(
@@ -686,19 +686,19 @@ GT_MetaTileEntity_MultiBlockBase {
if (aMetaTileEntity == null) {
return false;
}
- if (isThisHatchMultiDynamo()) {
+ if (isThisHatchMultiDynamo(aTileEntity)) {
updateTexture(aTileEntity, aBaseCasingIndex);
return this.mMultiDynamoHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity);
}
return false;
}
- public boolean isThisHatchMultiDynamo(){
+ public boolean isThisHatchMultiDynamo(Object aMetaTileEntity){
Class mDynamoClass;
try {
mDynamoClass = Class.forName("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti");
if (mDynamoClass != null){
- if (mDynamoClass.isInstance(this)){
+ if (mDynamoClass.isInstance(aMetaTileEntity)){
return true;
}
}
@@ -710,7 +710,7 @@ GT_MetaTileEntity_MultiBlockBase {
@Override
public boolean addDynamoToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
if (LoadedMods.TecTech){
- if (isThisHatchMultiDynamo()) {
+ if (isThisHatchMultiDynamo(aTileEntity)) {
addMultiAmpDynamoToMachineList(aTileEntity, aBaseCasingIndex);
}