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

Possible fix for not registering right click air events.

Browse Source
This commit is contained in:
GJ 2012-02-27 23:38:33 -05:00
parent 8ad4e20cab
commit 2b9baaf0ea
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/Combat.java
View File

@ -181,7 +181,7 @@ public class Combat
public static void combatAbilityChecks(Player attacker, PlayerProfile PPa)
{
//Check to see if any abilities need to be activated
if(PPa.getAxePreparationMode() && mcPermissions.getInstance().axesAbility(attacker))
if(PPa.getAxePreparationMode())
Skills.abilityCheck(attacker, SkillType.AXES);
if(PPa.getSwordsPreparationMode())
Skills.abilityCheck(attacker, SkillType.SWORDS);

3
src/main/java/com/gmail/nossr50/datatypes/ToolType.java
View File

@ -1,5 +1,6 @@
package com.gmail.nossr50.datatypes;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import com.gmail.nossr50.m;
@ -118,7 +119,7 @@ public enum ToolType
case AXE:
return m.isAxes(is);
case FISTS:
return is == null;
return is.equals(Material.AIR);
case HOE:
return m.isHoe(is);
case PICKAXE:

2
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -224,7 +224,7 @@ public class mcPlayerListener implements Listener
player.updateInventory();
}
if(LoadProperties.enableAbilities && m.abilityBlockCheck(block))
if(LoadProperties.enableAbilities && (m.abilityBlockCheck(block) || block.getType() == Material.AIR))
{
if(block != null && m.isHoe(is) && !mat.equals(Material.DIRT) && !mat.equals(Material.GRASS) && !mat.equals(Material.SOIL))
Skills.activationCheck(player, SkillType.HERBALISM);

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

@ -94,7 +94,8 @@ public class Skills
}
}
public static void monitorSkill(Player player, PlayerProfile PP, long curTime, SkillType skill){
public static void monitorSkill(Player player, PlayerProfile PP, long curTime, SkillType skill)
{
ToolType tool = skill.getTool();
AbilityType ability = skill.getAbility();
if(tool.getToolMode(PP) && curTime - (tool.getToolATS(PP) * 1000) >= 4000)