EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-03 18:43:43 +01:00
Code Issues Projects Releases Wiki Activity

Skill shot should be after deflect check

Browse Source
This commit is contained in:
t00thpick1
2013-09-11 10:17:24 -04:00
parent d6630a0eb5
commit f7928787dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -141,10 +141,6 @@ public final class CombatUtils {
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager(); ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager();
if (archeryManager.canSkillShot()) {
archeryManager.skillShot(target, event.getDamage(), arrow);
}
if (target instanceof Player && SkillType.UNARMED.getPVPEnabled()) { if (target instanceof Player && SkillType.UNARMED.getPVPEnabled()) {
UnarmedManager unarmedManager = UserManager.getPlayer((Player) target).getUnarmedManager(); UnarmedManager unarmedManager = UserManager.getPlayer((Player) target).getUnarmedManager();
@@ -157,6 +153,10 @@ public final class CombatUtils {
} }
} }
if (archeryManager.canSkillShot()) {
archeryManager.skillShot(target, event.getDamage(), arrow);
}
if (archeryManager.canDaze(target)) { if (archeryManager.canDaze(target)) {
archeryManager.daze((Player) target, arrow); archeryManager.daze((Player) target, arrow);
} }