Merge branch 'Pollution-code' of https://github.com/GTNewHorizons/GT5-Unofficial into Pollution-code

# Conflicts:
#	src/main/java/gregtech/common/GT_Pollution.java
This commit is contained in:
Technus 2016-10-03 12:15:00 +02:00
commit f21b9d6e82

View file

@ -171,7 +171,8 @@ public class GT_Pollution {
} }
}catch(Exception e){} }catch(Exception e){}
} }
//PLACE HOLDER
public static void onWorldTickClient(World aWorld, int aTick){ public static void onWorldTickClient(World aWorld, int aTick){
if(!GT_Mod.gregtechproxy.mPollution)return; if(!GT_Mod.gregtechproxy.mPollution)return;
if(aTick == 0 || (tList==null && GT_Proxy.chunkData!=null)){ if(aTick == 0 || (tList==null && GT_Proxy.chunkData!=null)){