Version 5.08.21

2 files changed, 6 insertions, 3 deletions

diff --git a/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/main/java/gregtech/api/metatileentity/BaseTileEntity.java
index 169998b5e5..49e7f4eca6 100644
--- a/main/java/gregtech/api/metatileentity/BaseTileEntity.java
+++ b/main/java/gregtech/api/metatileentity/BaseTileEntity.java
@@ -127,13 +127,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     @Override
     public final boolean getOpacity(int aX, int aY, int aZ) {
     	if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return false;
-    	return GT_Utility.isOpaqueBlock(worldObj, aX, aY, aZ);
+    	return GT_Utility.isBlockOpaque(worldObj, aX, aY, aZ,true,true);
     }
     
     @Override
     public final boolean getAir(int aX, int aY, int aZ) {
     	if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return true;
-    	return GT_Utility.isAirBlock(worldObj, aX, aY, aZ);
+    	return GT_Utility.isBlockAir(worldObj, aX, aY, aZ);
     }
     
     @Override
diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index 45b9205d9f..58336d2116 100644
--- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -336,7 +336,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
 			}
 			if (mInventory[1] != null && getBaseMetaTileEntity().getRandomNumber(2) == 0 &&!mInventory[1].getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.")) {
 				if(mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01){
-					((GT_MetaGenerated_Tool)mInventory[1].getItem()).doDamage(mInventory[1], mEUt/5);
+					((GT_MetaGenerated_Tool)mInventory[1].getItem()).doDamage(mInventory[1], (long) Math.min(mEUt/5, Math.pow(mEUt, 0.7)));
+					if(mInventory[1]!=null&&mInventory[1].getItem().getDamage(mInventory[1])>mInventory[1].getMaxDamage()){
+						mInventory[1]=null;
+					}
 				}
 			}
 		}