aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2016-10-20 13:17:18 +0200
committerTechnus <daniel112092@gmail.com>2016-10-20 13:17:18 +0200
commit1d15e8ae8a9df54746a72d7010985f82d95bf40d (patch)
treef437edb76fad1a8a5de62fdc972e3cb44c4ed7e0 /src/main/java/gregtech/common
parentfce26cd0be4e3c7a444b81cea29f1c9d29ef44dd (diff)
downloadGT5-Unofficial-1d15e8ae8a9df54746a72d7010985f82d95bf40d.tar.gz
GT5-Unofficial-1d15e8ae8a9df54746a72d7010985f82d95bf40d.tar.bz2
GT5-Unofficial-1d15e8ae8a9df54746a72d7010985f82d95bf40d.zip
Pollution effects detects Full hazmat now
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Pollution.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java
index 9ded79ca08..c6fc5942bb 100644
--- a/src/main/java/gregtech/common/GT_Pollution.java
+++ b/src/main/java/gregtech/common/GT_Pollution.java
@@ -76,7 +76,7 @@ public class GT_Pollution {
AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(tPos.chunkPosX<<4, 0, tPos.chunkPosZ<<4, (tPos.chunkPosX<<4)+16, 256, (tPos.chunkPosZ<<4)+16);
List<EntityLivingBase> tEntitys = aWorld.getEntitiesWithinAABB(EntityLivingBase.class, chunk);
for(EntityLivingBase tEnt : tEntitys){
- if(tRan.nextInt(tPollution/25000) > 10){
+ if(!GT_Utility.isWearingFullGasHazmat(tEnt) && tRan.nextInt(tPollution/25000) > 10){
tEnt.addPotionEffect(new PotionEffect(Potion.weakness.id, Math.min(tPollution/1000,1000), 1));
tEnt.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, Math.min(tPollution/1000,1000), 1));
tEnt.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, Math.min(tPollution/1000,1000), 1));
@@ -87,7 +87,7 @@ public class GT_Pollution {
//AxisAlignedBB chunk = AxisAlignedBB.getBoundingBox(tPos.chunkPosX*16, 0, tPos.chunkPosZ*16, tPos.chunkPosX*16+16, 256, tPos.chunkPosZ*16+16);
//List<EntityLiving> tEntitys = aWorld.getEntitiesWithinAABB(EntityLiving.class, chunk);
for(EntityLivingBase tEnt : tEntitys){
- if(tRan.nextInt(tPollution/25000) > 20){
+ if(!GT_Utility.isWearingFullGasHazmat(tEnt) && tRan.nextInt(tPollution/25000) > 20){
tEnt.addPotionEffect(new PotionEffect(Potion.confusion.id, Math.min(tPollution/2000,1000), 1));
tEnt.addPotionEffect(new PotionEffect(Potion.poison.id, Math.min(tPollution/4000,1000), 1));
tEnt.addPotionEffect(new PotionEffect(Potion.blindness.id, Math.min(tPollution/2000,1000), 1));