aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-11-16 15:50:56 +1000
committerAlkalus <draknyte1@hotmail.com>2017-11-16 15:50:56 +1000
commit5144539962acc7d02248ed7075507b850044d877 (patch)
tree65ede90a22d833533ff80c4eee9a89b8d431bada /src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines
parentc4963cab1c91ef09eb7b5694e8fa59ccb1023184 (diff)
downloadGT5-Unofficial-5144539962acc7d02248ed7075507b850044d877.tar.gz
GT5-Unofficial-5144539962acc7d02248ed7075507b850044d877.tar.bz2
GT5-Unofficial-5144539962acc7d02248ed7075507b850044d877.zip
+ Added in annoying logging.
$ Fixed NPE when tickhandler tries to get null Tile entity. % Tweaked Stored Energy and A/in/t for Wireless Charger.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index 1ceb4c6a7b..f0b2958c17 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -184,7 +184,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
@Override public boolean isOutputFacing(final byte aSide) {return aSide==this.getBaseMetaTileEntity().getFrontFacing();}
@Override public boolean isTeleporterCompatible() {return false;}
@Override public long getMinimumStoredEU() {return 0;}
- @Override public long maxEUStore() {return GT_Values.V[this.mTier]*32;}
+ @Override public long maxEUStore() {return GT_Values.V[this.mTier]*128;}
@Override
public int getCapacity() {
@@ -207,10 +207,10 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
return 2;
}
else if (this.mMode == 1){
- return this.mLocalChargingMap.size();
+ return this.mLocalChargingMap.size()*8;
}
else {
- return (this.mLocalChargingMap.size()+this.mWirelessChargingMap.size());
+ return ((this.mLocalChargingMap.size()*4)+this.mWirelessChargingMap.size());
}
}