diff options
| author | Technus <daniel112092@gmail.com> | 2017-03-03 16:01:10 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-03-03 16:01:10 +0100 |
| commit | 8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a (patch) | |
| tree | 698983182a71d2cd028aae765b040f7c84ab0d74 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 68202491c6247d64fe1559552857b527c4d16d2e (diff) | |
| parent | 5932e76f836b8bb023c66e21f3b11058abd497eb (diff) | |
| download | GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.tar.gz GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.tar.bz2 GT5-Unofficial-8bc7fa7f69946f8a3856f78b9b6eb5b5055c667a.zip | |
Merge not EM related stuff from branch 'eM' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java index feb87ed33f..ea4cf6b633 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java @@ -88,12 +88,13 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); - if(this.getBaseMetaTileEntity().isActive()) - pollutionParticles(this.getBaseMetaTileEntity().getWorld()); + if(aBaseMetaTileEntity.isClientSide() && this.getBaseMetaTileEntity().isActive()) + pollutionParticles(this.getBaseMetaTileEntity().getWorld(),"largesmoke"); } - public void pollutionParticles(World aWorld){ - XSTR floatGen=new XSTR(); + private static XSTR floatGen=new XSTR(); + + public void pollutionParticles(World aWorld,String name){ boolean chk1,chk2,chk3; float ran1=floatGen.nextFloat(),ran2=0,ran3=0; chk1=ran1*100<calculatePollutionReduction(100); @@ -128,12 +129,12 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { } if(chk1) - aWorld.spawnParticle("largesmoke", xPos + ran1*0.5F, yPos + floatGen.nextFloat()*0.5F, zPos + floatGen.nextFloat()*0.5F, xSpd, ySpd, zSpd); + aWorld.spawnParticle(name, xPos + ran1*0.5F, yPos + floatGen.nextFloat()*0.5F, zPos + floatGen.nextFloat()*0.5F, xSpd, ySpd, zSpd); if(chk2) - aWorld.spawnParticle("largesmoke", xPos + ran2*0.5F, yPos + floatGen.nextFloat()*0.5F, zPos + floatGen.nextFloat()*0.5F, xSpd, ySpd, zSpd); + aWorld.spawnParticle(name, xPos + ran2*0.5F, yPos + floatGen.nextFloat()*0.5F, zPos + floatGen.nextFloat()*0.5F, xSpd, ySpd, zSpd); if(chk3) - aWorld.spawnParticle("largesmoke", xPos + ran3*0.5F, yPos + floatGen.nextFloat()*0.5F, zPos + floatGen.nextFloat()*0.5F, xSpd, ySpd, zSpd); + aWorld.spawnParticle(name, xPos + ran3*0.5F, yPos + floatGen.nextFloat()*0.5F, zPos + floatGen.nextFloat()*0.5F, xSpd, ySpd, zSpd); } } |