From 903661501e6c2a6752d18c8596efb55d225c2a15 Mon Sep 17 00:00:00 2001 From: Maxime Legkiy Date: Mon, 6 Mar 2017 22:09:55 +0300 Subject: Fixed #935 --- src/main/java/gregtech/api/util/GT_Utility.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 3d151175a2..9cbc269684 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1556,8 +1556,9 @@ public class GT_Utility { tFluidId = 0; } + try { ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16)); - int[] tInts = new int[0]; + int[] tInts = new int[2]; if(GT_Proxy.chunkData.containsKey(tPos)){ tInts = GT_Proxy.chunkData.get(tPos); if(tInts.length>0){ @@ -1579,6 +1580,9 @@ public class GT_Utility { tInts[0] = tAmount; tInts[2] = tFluidId; GT_Proxy.chunkData.put(tPos, tInts); + } catch (Exception e) { + System.out.println("[GT] getUndergroundOil() - Error put data"); + } if (tFluid!=null) return new FluidStack(tFluid, tAmount); return null; -- cgit From c3101d6f04c143c6a8381142eff5e33f4dbccfcf Mon Sep 17 00:00:00 2001 From: Maxime Legkiy Date: Mon, 6 Mar 2017 22:26:16 +0300 Subject: Fixed #935 --- src/main/java/gregtech/api/util/GT_Utility.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 9cbc269684..5c2547196c 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1558,7 +1558,7 @@ public class GT_Utility { try { ChunkPosition tPos = new ChunkPosition(getScaleCoordinates(aX,16), aWorld.provider.dimensionId, getScaleCoordinates(aZ,16)); - int[] tInts = new int[2]; + int[] tInts = new int[3]; if(GT_Proxy.chunkData.containsKey(tPos)){ tInts = GT_Proxy.chunkData.get(tPos); if(tInts.length>0){ @@ -1581,7 +1581,7 @@ public class GT_Utility { tInts[2] = tFluidId; GT_Proxy.chunkData.put(tPos, tInts); } catch (Exception e) { - System.out.println("[GT] getUndergroundOil() - Error put data"); + System.out.println("getUndergroundOil() - Error put data"); } if (tFluid!=null) return new FluidStack(tFluid, tAmount); -- cgit From d60695addd9830b70247e5003bd95dfb422e3fb4 Mon Sep 17 00:00:00 2001 From: Maxime Legkiy Date: Tue, 7 Mar 2017 00:26:57 +0300 Subject: Fix Pollution Neighbor BUG --- src/main/java/gregtech/common/GT_Pollution.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index 1fae98a25c..7666a6bb1b 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -69,7 +69,7 @@ public class GT_Pollution { tList.remove(0); if(tPos!=null && GT_Proxy.chunkData.containsKey(tPos)){ int tPollution = GT_Proxy.chunkData.get(tPos)[1]; -// System.out.println("process: "+tPos.chunkPosX+" "+tPos.chunkPosZ+" "+tPollution); +// System.out.println("process: "+tPos.chunkPosY+" "+tPos.chunkPosX+" "+tPos.chunkPosZ+" "+tPollution); //Reduce pollution in chunk tPollution = (int)(0.99f*tPollution); tPollution -= 2000; @@ -77,10 +77,10 @@ public class GT_Pollution { //Spread Pollution if(tPollution>50000){ List tNeighbor = new ArrayList(); - tNeighbor.add(new ChunkPosition(tPos.chunkPosX+1, 1, tPos.chunkPosZ)); - tNeighbor.add(new ChunkPosition(tPos.chunkPosX-1, 1, tPos.chunkPosZ)); - tNeighbor.add(new ChunkPosition(tPos.chunkPosX, 1, tPos.chunkPosZ+1)); - tNeighbor.add(new ChunkPosition(tPos.chunkPosX, 1, tPos.chunkPosZ-1)); + tNeighbor.add(new ChunkPosition(tPos.chunkPosX+1, tPos.chunkPosY, tPos.chunkPosZ)); + tNeighbor.add(new ChunkPosition(tPos.chunkPosX-1, tPos.chunkPosY, tPos.chunkPosZ)); + tNeighbor.add(new ChunkPosition(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ+1)); + tNeighbor.add(new ChunkPosition(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ-1)); for(ChunkPosition tNPos : tNeighbor){ if(GT_Proxy.chunkData.containsKey(tNPos)){ int tNPol = GT_Proxy.chunkData.get(tNPos)[1]; @@ -194,7 +194,7 @@ public class GT_Pollution { try{ ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleCoordinates(aPos.chunkPosX,16), aWorld.provider.dimensionId, GT_Utility.getScaleCoordinates(aPos.chunkPosZ,16)); // OLD in coordinate -1 -1 chunk 0 0 // System.out.println("add pollution dim: "+aWorld.provider.dimensionId+" x: "+ tPos.chunkPosX +" z: " + tPos.chunkPosZ +" poll: "+aPollution); - int[] tData = new int[2]; + int[] tData = new int[3]; if(GT_Proxy.chunkData.containsKey(tPos)){ tData = GT_Proxy.chunkData.get(tPos); if(tData.length>1){ -- cgit