diff options
| author | Maxim <maxim235@gmx.de> | 2023-05-28 11:36:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-28 11:36:30 +0200 |
| commit | 34597af2b1c4869e97ce83586fcfc82c88cdb401 (patch) | |
| tree | cd698e3bebf92e42188a1bf687212c55c4904ddc /src/main | |
| parent | 8b70580d87db7151da71caa71f89f08f05921e29 (diff) | |
| download | GT5-Unofficial-34597af2b1c4869e97ce83586fcfc82c88cdb401.tar.gz GT5-Unofficial-34597af2b1c4869e97ce83586fcfc82c88cdb401.tar.bz2 GT5-Unofficial-34597af2b1c4869e97ce83586fcfc82c88cdb401.zip | |
Delegate blast resistance call to MetaPipeEntity to allow overriding (#2030)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 29f109fca0..579903db0b 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -1305,7 +1305,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity @Override public float getBlastResistance(ForgeDirection side) { - return (mConnections & IConnectable.HAS_FOAM) != 0 ? 50.0F : 5.0F; + return canAccessData() ? Math.max(0, getMetaTileEntity().getExplosionResistance(side)) : 5.0F; } @Override diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index fce33f3e8d..011bf1527f 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -726,7 +726,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { @Override public float getExplosionResistance(ForgeDirection side) { - return 10.0F; + return (mConnections & IConnectable.HAS_FOAM) != 0 ? 50.0F : 5.0F; } @Override |