diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-10-18 20:08:16 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-18 20:08:16 +0200 |
| commit | 1bde4a911eb60b0a294c7a2663e521ef5175db1b (patch) | |
| tree | f98d6ae8842c61fbbe7da96a3d835ddb96034a59 /src/main/java/gregtech/common/blocks | |
| parent | b25533322785b9101bc005af1510e6cfddf5cece (diff) | |
| parent | a53ca90e7fa20af828e313fd3a82ae211caf0acb (diff) | |
| download | GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.tar.gz GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.tar.bz2 GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.zip | |
Merge branch 'experimental' into GT_dev
# Conflicts:
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Machines.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index 36d32bca6d..8f943c8588 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -334,6 +334,7 @@ public class GT_Block_Machines public void onBlockExploded(World aWorld, int aX, int aY, int aZ, Explosion aExplosion) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if ((tTileEntity instanceof BaseMetaTileEntity)) {
+ GT_Log.exp.println("Explosion at :"+aX + " | " + aY+ " | " + aZ +" DIMID: " + aWorld.provider.dimensionId+ " due to near explosion!");
((BaseMetaTileEntity) tTileEntity).doEnergyExplosion();
}
super.onBlockExploded(aWorld, aX, aY, aZ, aExplosion);
@@ -423,6 +424,7 @@ public class GT_Block_Machines TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if ((tTileEntity != null) && (chance < 1.0F)) {
if (((tTileEntity instanceof BaseMetaTileEntity)) && (GregTech_API.sMachineNonWrenchExplosions)) {
+ GT_Log.exp.println("Explosion at :"+aX + " | " + aY+ " | " + aZ +" DIMID: "+ aWorld.provider.dimensionId+ " due to NonWrench picking/Rain!");
((BaseMetaTileEntity) tTileEntity).doEnergyExplosion();
}
} else {
|