Move DualHarvest speed calc also into AbilityHelper

This commit is contained in:
Bernhard Bonigl committed 2014-10-28 17:56:09 +01:00
1 parent 5495722194
commit e6469587fe
2 files changed
+20 -20

No files matched your search

@@ -56,16 +56,8 @@ public abstract class DualHarvestTool extends HarvestTool
{
if (materials[i] == block.getMaterial())
{
float speed = tags.getInteger("MiningSpeed");
speed /= 100f;
int hlvl = block.getHarvestLevel(meta);
int durability = tags.getInteger("Damage");
float shoddy = tags.getFloat("Shoddy");
speed += shoddy * durability / 100f;
if (hlvl <= tags.getInteger("HarvestLevel"))
return speed;
if (block.getHarvestLevel(meta) <= tags.getInteger("HarvestLevel"))
AbilityHelper.calcDualToolSpeed(this, tags, false);
return 0.1f;
}
}
@@ -74,16 +66,8 @@ public abstract class DualHarvestTool extends HarvestTool
{
if (materials[i] == block.getMaterial())
{
float speed = tags.getInteger("MiningSpeed2");
speed /= 100f;
int hlvl = block.getHarvestLevel(meta);
int durability = tags.getInteger("Damage");
float shoddy = tags.getFloat("Shoddy");
speed += shoddy * durability / 100f;
if (hlvl <= tags.getInteger("HarvestLevel2"))
return speed;
if (block.getHarvestLevel(meta) <= tags.getInteger("HarvestLevel2"))
AbilityHelper.calcDualToolSpeed(this, tags, true);
return 0.1f;
}
}