aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-09-27 02:00:19 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-09-27 02:00:19 +0200
commit16fb901529b24d4d1d4aaf64984b72de75fda0c5 (patch)
tree684287e90b9278e777fb6f8c894a7259e55b4e81 /src/main/java/gregtech/api/util
parent97d7efcc22b3c05f8631188bad33099cd4ce8c6b (diff)
downloadGT5-Unofficial-16fb901529b24d4d1d4aaf64984b72de75fda0c5.tar.gz
GT5-Unofficial-16fb901529b24d4d1d4aaf64984b72de75fda0c5.tar.bz2
GT5-Unofficial-16fb901529b24d4d1d4aaf64984b72de75fda0c5.zip
More Pollution & bugfixes
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 34ef3d0963..fba405dca4 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -860,10 +860,12 @@ public class GT_Utility {
return false;
}
}
+ ItemStack[] tStack = GT_OreDictUnificator.getStackArray(true, aOutput);
+ if(tStack==null||(tStack.length>0&&GT_Utility.areStacksEqual(aInput, tStack[0])))return false;
if (tOreName != null) {
- aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, GT_OreDictUnificator.getStackArray(true, aOutput)));
+ aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, tStack));
} else {
- aRecipeList.put(new RecipeInputItemStack(copy(aInput), aInput.stackSize), new RecipeOutput(aNBT, GT_OreDictUnificator.getStackArray(true, aOutput)));
+ aRecipeList.put(new RecipeInputItemStack(copy(aInput), aInput.stackSize), new RecipeOutput(aNBT, tStack));
}
return true;
}
@@ -1741,7 +1743,7 @@ public class GT_Utility {
tList.add("Oil in Chunk: " + tFluid.amount + " " + tFluid.getLocalizedName());
}
if(aPlayer.capabilities.isCreativeMode){
- ChunkPosition tPos = new ChunkPosition(aX, aY, aZ);
+ ChunkPosition tPos = new ChunkPosition(aX/16, 1, aZ/16);
if(GT_Proxy.chunkData.containsKey(tPos)){
int[] tPollution = GT_Proxy.chunkData.get(tPos);
if(tPollution.length>1){