EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

WIP on Archery rework.

Browse Source
This commit is contained in:
GJ
2012-06-12 21:36:01 -04:00
parent 050b794b42
commit 29c629eb22
7 changed files with 241 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -30,7 +30,7 @@ import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.runnables.GainXp;
import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
import com.gmail.nossr50.skills.combat.Archery;
import com.gmail.nossr50.skills.archery.ArcheryManager;
import com.gmail.nossr50.skills.combat.Axes;
import com.gmail.nossr50.skills.combat.Swords;
import com.gmail.nossr50.skills.combat.Unarmed;
@ -274,17 +274,16 @@ public class Combat {
event.setDamage(damage + archeryBonus);
}
if (target instanceof Player && permInstance.daze(shooter)) {
Archery.dazeCheck((Player) target, shooter, event);
ArcheryManager archeryManager = new ArcheryManager(shooter);
if (target instanceof Player) {
archeryManager.dazeCheck((Player) target, event);
}
PlayerProfile PP = Users.getProfile(shooter);
if (permInstance.trackArrows(shooter)) {
Archery.trackArrows(target, PP);
}
archeryManager.trackArrows(target);
if (target != shooter) {
PlayerProfile PP = Users.getProfile(shooter);
startGainXp(shooter, PP, target, SkillType.ARCHERY);
}
}