Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Bugfixes 4 fix: Remove commented code

Browse source
This commit is contained in:
Muramasa 2016-08-14 07:34:36 +01:00
parent 1abb196a2f
commit 30b7a0d7e8
4 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
View file

@ -200,9 +200,6 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
if (tTargetChargeItem == null || !GT_ModHandler.isElectricItem(tTargetChargeItem)) { if (tTargetChargeItem == null || !GT_ModHandler.isElectricItem(tTargetChargeItem)) {
tTargetChargeItem = null; tTargetChargeItem = null;
} }
/*if (tTargetDechargeItem == null || !GT_ModHandler.isElectricItem(tTargetChargeItem) || !(aStack == tTargetDechargeItem || GT_ModHandler.isChargerItem(tTargetDechargeItem))) {
tTargetDechargeItem = null;//not need in J2SE 6.0?
}*/
if (aPlayer.worldObj.isDaytime() && aPlayer.worldObj.canBlockSeeTheSky(MathHelper.floor_double(aPlayer.posX), MathHelper.floor_double(aPlayer.posY + 1), MathHelper.floor_double(aPlayer.posZ))) { if (aPlayer.worldObj.isDaytime() && aPlayer.worldObj.canBlockSeeTheSky(MathHelper.floor_double(aPlayer.posX), MathHelper.floor_double(aPlayer.posY + 1), MathHelper.floor_double(aPlayer.posZ))) {
if ((mSpecials & 32) != 0 && tTargetChargeItem != null) { if ((mSpecials & 32) != 0 && tTargetChargeItem != null) {

2
src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
View file

@ -53,8 +53,6 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
for (int i = 0; i < pulses; i++) { for (int i = 0; i < pulses; i++) {
acceptUraniumPulse(reactor, yourStack, yourStack, x, y, x, y, heatrun); acceptUraniumPulse(reactor, yourStack, yourStack, x, y, x, y, heatrun);
} }
//dead code?
//pulses += checkPulseable(reactor, x - 1, y, yourStack, x, y, heatrun) + checkPulseable(reactor, x + 1, y, yourStack, x, y, heatrun) + checkPulseable(reactor, x, y - 1, yourStack, x, y, heatrun) + checkPulseable(reactor, x, y + 1, yourStack, x, y, heatrun);
checkPulseable(reactor, x - 1, y, yourStack, x, y, heatrun);checkPulseable(reactor, x + 1, y, yourStack, x, y, heatrun);checkPulseable(reactor, x, y - 1, yourStack, x, y, heatrun);checkPulseable(reactor, x, y + 1, yourStack, x, y, heatrun); checkPulseable(reactor, x - 1, y, yourStack, x, y, heatrun);checkPulseable(reactor, x + 1, y, yourStack, x, y, heatrun);checkPulseable(reactor, x, y - 1, yourStack, x, y, heatrun);checkPulseable(reactor, x, y + 1, yourStack, x, y, heatrun);
} else { } else {
pulses += checkPulseable(reactor, x - 1, y, yourStack, x, y, heatrun) + checkPulseable(reactor, x + 1, y, yourStack, x, y, heatrun) + checkPulseable(reactor, x, y - 1, yourStack, x, y, heatrun) + checkPulseable(reactor, x, y + 1, yourStack, x, y, heatrun); pulses += checkPulseable(reactor, x - 1, y, yourStack, x, y, heatrun) + checkPulseable(reactor, x + 1, y, yourStack, x, y, heatrun) + checkPulseable(reactor, x, y - 1, yourStack, x, y, heatrun) + checkPulseable(reactor, x, y + 1, yourStack, x, y, heatrun);

2
src/main/java/gregtech/common/GT_RecipeAdder.java
View file

@ -142,7 +142,7 @@ public class GT_RecipeAdder
if ((aInput1 == null) || (aOutput1 == null)) { if ((aInput1 == null) || (aOutput1 == null)) {
return false; return false;
} }
if ((/*aDuration = */GregTech_API.sRecipeFile.get("cnc", aOutput1, aDuration)) <= 0) { if ((GregTech_API.sRecipeFile.get("cnc", aOutput1, aDuration)) <= 0) {
return false; return false;
} }
return true; return true;

3
src/main/java/gregtech/common/GT_Worldgenerator.java
View file

@ -107,9 +107,6 @@ public class GT_Worldgenerator
int j = 0; int j = 0;
for (int tZ = this.mZ - 16; j < 3; tZ += 16) { for (int tZ = this.mZ - 16; j < 3; tZ += 16) {
String tBiome = this.mWorld.getBiomeGenForCoords(tX + 8, tZ + 8).biomeName; String tBiome = this.mWorld.getBiomeGenForCoords(tX + 8, tZ + 8).biomeName;
/*if (tBiome == null) {
+ tBiome = BiomeGenBase.plains.biomeName;//FindBugs: DLS - DLS_DEAD_LOCAL_STORE
+ }*/
for (GT_Worldgen tWorldGen : GregTech_API.sWorldgenList) { for (GT_Worldgen tWorldGen : GregTech_API.sWorldgenList) {
try { try {
tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, tX, tZ, this.mChunkGenerator, this.mChunkProvider); tWorldGen.executeWorldgen(this.mWorld, this.mRandom, this.mBiome, this.mDimensionType, tX, tZ, this.mChunkGenerator, this.mChunkProvider);