From f7928787dc85c5d5f4f57b597e3d27e0969390f3 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Wed, 11 Sep 2013 10:17:24 -0400 Subject: [PATCH] Skill shot should be after deflect check --- .../java/com/gmail/nossr50/util/skills/CombatUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index 5f343a356..c85b399cb 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -141,10 +141,6 @@ public final class CombatUtils { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager(); - if (archeryManager.canSkillShot()) { - archeryManager.skillShot(target, event.getDamage(), arrow); - } - if (target instanceof Player && SkillType.UNARMED.getPVPEnabled()) { 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)) { archeryManager.daze((Player) target, arrow); }