Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

fix for timber changes

Browse source
This commit is contained in:
Blood-Asp 2017-06-14 01:30:36 +02:00
parent c397df4523
commit e6de8921c0
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
View file

@ -220,10 +220,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
@Mod.EventHandler
public float onBlockBreakSpeedEvent(float aDefault, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, PlayerEvent.BreakSpeed aEvent)
{
IToolStats tStats = getToolStats(aStack);
float tTest = tStats == null ? aDefault : tStats.getMiningSpeed(aBlock, aMetaData, aDefault, aPlayer, aPlayer.worldObj, aX, aY, aZ);
System.out.println("test: "+tTest+" default: "+aDefault);
return tTest;
IToolStats tStats = getToolStats(aStack);
return tStats == null ? aDefault : tStats.getMiningSpeed(aBlock, aMetaData, aDefault, aPlayer, aPlayer.worldObj, aX, aY, aZ);
}
@Override

8
src/main/java/gregtech/common/tools/GT_Tool.java
View file

@ -146,15 +146,9 @@ public abstract class GT_Tool
public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {
return aOriginalDamage;
}
public float getMiningSpeed(Block aBlock, byte aMetaData)
{
return isMinableBlock(aBlock, aMetaData) ? 1.0F : 0.0F;
}
@Override
public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj, int aX, int aY, int aZ) {
return getMiningSpeed(aBlock, aMetaData);
return aDefault;
}
}