1
0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-03 06:04:44 +02:00

Merge pull request from broccolai/master

Check to make sure correct item is being damaged in Fishing exploit prevention
This commit is contained in:
Robert Alan Chapton
2020-04-16 12:03:48 -07:00
committed by GitHub

@ -78,8 +78,15 @@ public class FishingManager extends SkillManager {
if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)
{
ItemStack fishingRod = getPlayer().getInventory().getItemInMainHand();
//Ensure correct hand item is damaged
if(fishingRod.getType() != Material.FISHING_ROD) {
fishingRod = getPlayer().getInventory().getItemInOffHand();
}
getPlayer().setFoodLevel(Math.max(getPlayer().getFoodLevel() - 1, 0));
getPlayer().getInventory().getItemInMainHand().setDurability((short) (getPlayer().getInventory().getItemInMainHand().getDurability() + 5));
fishingRod.setDurability((short) (fishingRod.getDurability() + 5));
getPlayer().updateInventory();
if(lastWarnedExhaust + (1000 * 1) < currentTime)