diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-08-26 19:02:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-26 17:02:17 +0000 |
commit | 804220fd3d7d569f43bc929bb00cb4876652d8e1 (patch) | |
tree | 454318ca3a65f90c5a6e6d9b3d484bd7f2c8c454 | |
parent | 8c406453e956a4630239ccb7088fe1706b61bb7d (diff) | |
download | GT5-Unofficial-804220fd3d7d569f43bc929bb00cb4876652d8e1.tar.gz GT5-Unofficial-804220fd3d7d569f43bc929bb00cb4876652d8e1.tar.bz2 GT5-Unofficial-804220fd3d7d569f43bc929bb00cb4876652d8e1.zip |
Fix breakBlock using wrong block metadata (#2980)
Fix long standing breakBlock bug
11 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java b/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java index a114cead69..bdc57f1e59 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java +++ b/src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java @@ -49,7 +49,7 @@ public class ShieldedAccGlass extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java index 1a00d16d85..b881f47cfa 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java @@ -108,7 +108,7 @@ public class BW_Blocks extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java index 0d1d9fd20b..e7abd0e6ce 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java @@ -37,7 +37,7 @@ public class BW_TileEntityContainer_MachineBlock extends BW_TileEntityContainer @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java index 67c77f5ac4..0ac925926c 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/GodforgeGlassBlock.java @@ -93,7 +93,7 @@ public class GodforgeGlassBlock extends BlockBase { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMeta)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java index 790b4f390b..6c22595b53 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java @@ -97,7 +97,7 @@ public final class QuantumGlassBlock extends BlockBase { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMeta) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMeta)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java index ef61327dd7..ff38365d79 100644 --- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java +++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java @@ -50,7 +50,7 @@ public abstract class BaseGTUpdateableBlock extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java index 9e01d783d2..c10b0f7184 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/Casing.java @@ -97,7 +97,7 @@ public class Casing extends Block { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java index 6c13a9c680..dcd2bdd801 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java @@ -114,7 +114,7 @@ public class TEBlock extends BlockContainer { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } aWorld.removeTileEntity(aX, aY, aZ); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index 59144666df..cfa51f8e99 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -100,7 +100,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java b/src/main/java/gregtech/common/blocks/GT_Block_Laser.java index 7ec03ce781..038b114284 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Laser.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Laser.java @@ -41,7 +41,7 @@ public class GT_Block_Laser extends Block implements ITileEntityProvider { @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java index a87f6c92b3..79d9e2c458 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java @@ -106,7 +106,7 @@ public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_ @Override public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock, final int aMetaData) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + if (GregTech_API.isMachineBlock(this, aMetaData)) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } |