aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/objects/GT_UO_DimensionList.java2
-rw-r--r--src/main/java/gregtech/common/GT_UndergroundOil.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
index e34ea1d4dd..a2cd2354d8 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
+++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
@@ -28,7 +28,7 @@ public class GT_UO_DimensionList {
return fDimensionList.get("Default");
}
- public boolean CheckBlackList(int aDimensionId){
+ private boolean CheckBlackList(int aDimensionId){
try {
return java.util.Arrays.binarySearch(blackList, aDimensionId) >= 0;
} catch (Exception e) {
diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/GT_UndergroundOil.java
index 98cf09fe88..1f45b5fca9 100644
--- a/src/main/java/gregtech/common/GT_UndergroundOil.java
+++ b/src/main/java/gregtech/common/GT_UndergroundOil.java
@@ -34,12 +34,13 @@ public class GT_UndergroundOil {
return undergroundOil(te.getWorld().getChunkFromBlockCoords(te.getXCoord(),te.getZCoord()),readOrDrainCoefficient);
}
- //Returns whole content for information purposes -> when drainSpeedCoeff < 0
+ //Returns whole content for information purposes -> when drainSpeedCoefficient < 0
//Else returns extracted fluidStack if amount > 0, or null otherwise
public static FluidStack undergroundOil(Chunk chunk, float readOrDrainCoefficient) {
World aWorld = chunk.worldObj;
int dimensionId=aWorld.provider.dimensionId;
- if (GT_Mod.gregtechproxy.mUndergroundOil.CheckBlackList(dimensionId)) return null;
+ GT_UO_Dimension dimension=GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId);
+ if(dimension==null) return null;
//Read hash map
HashMap<ChunkCoordIntPair, int[]> chunkData = dimensionWiseChunkData.get(dimensionId);
@@ -61,15 +62,14 @@ public class GT_UndergroundOil {
(chunk.getChunkCoordIntPair().chunkXPos>>3) +
8267 * (chunk.getChunkCoordIntPair().chunkZPos>>3));
- GT_UO_Dimension dimension=GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId);
GT_UO_Fluid uoFluid = dimension.getRandomFluid(tRandom);
//Fluid stack holder
FluidStack fluidInChunk;
- //Set fluidstack from uoFluid
+ //Set fluid stack from uoFluid
if (uoFluid == null || uoFluid.getFluid()==null){
- tInts[GTOILFLUID]=Integer.MAX_VALUE;//null fluid pointer... kindof
+ tInts[GTOILFLUID]=Integer.MAX_VALUE;//null fluid pointer... kind of
tInts[GTOIL]=0;
chunkData.put(chunk.getChunkCoordIntPair(),tInts);//update hash map
return null;