Fix breakBlock using wrong block metadata (GTNewHorizons#2980)

Fix long standing breakBlock bug
Volence · Aug 26, 2024 · 804220f · 804220f
1 parent 8c40645
commit 804220f
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 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
@@ -49,7 +49,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -108,7 +108,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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/...com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java b/...com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer_MachineBlock.java
@@ -37,7 +37,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -93,7 +93,7 @@ public static void run() {
 
     @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
@@ -97,7 +97,7 @@ public static void run() {
 
     @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
@@ -50,7 +50,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -97,7 +97,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -114,7 +114,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -100,7 +100,7 @@ public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -41,7 +41,7 @@ public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
 
     @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
@@ -106,7 +106,7 @@ public int getRenderBlockPass() {
     @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);
         }
     }