EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-30 00:56:47 +01:00
Code Issues Projects Releases Wiki Activity

Remove offhand fishing rod if not in main hand

Browse Source 
Fixes mcMMO-Dev/mcMMO#3342
Fixed style error in last commit
This commit is contained in:
ezeiger92 2018-02-15 13:59:10 -08:00
parent 40b609ccd8
commit 6d2003d577
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -134,6 +134,9 @@ public class FishingManager extends SkillManager {
if (player.getInventory().getItemInMainHand().getType() == Material.FISHING_ROD) { if (player.getInventory().getItemInMainHand().getType() == Material.FISHING_ROD) {
player.getInventory().setItemInMainHand(null); player.getInventory().setItemInMainHand(null);
} }
else if (player.getInventory().getItemInOffHand().getType() == Material.FISHING_ROD) {
player.getInventory().setItemInOffHand(null);
}
LivingEntity kraken = (LivingEntity) world.spawnEntity(player.getEyeLocation(), (Misc.getRandom().nextInt(100) == 0 ? EntityType.CHICKEN : EntityType.SQUID)); LivingEntity kraken = (LivingEntity) world.spawnEntity(player.getEyeLocation(), (Misc.getRandom().nextInt(100) == 0 ? EntityType.CHICKEN : EntityType.SQUID));
kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName()); kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName());

2
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@ -188,7 +188,7 @@ public class SkillUtils {
* @param maxDamageModifier the amount to adjust the max damage by * @param maxDamageModifier the amount to adjust the max damage by
*/ */
public static void handleDurabilityChange(ItemStack itemStack, int durabilityModifier, double maxDamageModifier) { public static void handleDurabilityChange(ItemStack itemStack, int durabilityModifier, double maxDamageModifier) {
if(itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { if (itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) {
return; return;
} }