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

Fixed arrow boucing off entities on daze proc

Browse Source
This commit is contained in:
bm01
2012-05-08 21:58:01 +02:00
parent 06f97ac2f1
commit 5fa79926db
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,9 +265,8 @@ public class Combat {
if (shooter instanceof Player) {
Player attacker = (Player) shooter;
PlayerProfile PPa = Users.getProfile(attacker);
int damage = event.getDamage();
if (permInstance.archery(attacker) && damage > 0) {
if (permInstance.archery(attacker)) {
if (permInstance.archeryBonus(attacker)) {
/*Archery needs a damage bonus to be viable in PVP*/
int skillLvl = Users.getProfile(attacker).getSkillLevel(SkillType.ARCHERY);
@ -280,8 +279,14 @@ public class Combat {
/* Every 50 skill levels Archery gains 10% damage bonus, set that here */
//TODO: Work in progress for balancing out Archery, will work on it more later...
int archeryBonus = (int)(event.getDamage() * dmgBonusPercent);
event.setDamage(event.getDamage() + archeryBonus);
int damage = event.getDamage();
int archeryBonus = (int) (damage * dmgBonusPercent);
event.setDamage(damage + archeryBonus);
}
if (target instanceof Player && permInstance.daze(attacker)) {
Archery.dazeCheck((Player) target, attacker, event);
}
if (permInstance.trackArrows(attacker)) {
@ -291,12 +296,6 @@ public class Combat {
if (target != attacker) {
startGainXp(attacker, PPa, target, SkillType.ARCHERY, pluginx);
}
if (target instanceof Player) {
if (permInstance.daze(attacker)) {
Archery.dazeCheck((Player) target, attacker);
}
}
}
}
}