EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Update AcrobaticsManager.java

Browse Source 
Fixes a bug that prevents the player from receiving XP while having Resistance from a beacon.
This commit is contained in:
Vincentyification 2014-01-02 13:21:20 +08:00
parent c12d4319ac
commit d6b3010b53
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@ -151,7 +151,21 @@ public class AcrobaticsManager extends SkillManager {
} }
private boolean isFatal(double damage) { private boolean isFatal(double damage) {
return getPlayer().getHealth() - damage <= 0; Player player = getPlayer();
int discount=1;
// If the player has resistance active, carry resistance checking
if(player.hasPotionEffect(PotionEffectType.DAMAGE_RESISTANCE)){
Iterator potions=t.getActivePotionEffects().iterator();
while(potions.hasNext()){
PotionEffect potion=(PotionEffect)potions.next();
if(potion.getType()==PotionEffectType.DAMAGE_RESISANCE)
{//Having resistance allows you to recieve less damage
int coupon=potion.getAmplifier();
discount=Math.min(0,1-(coupon*0.2));
}
}
}//...Which is accounted here
return getPlayer().getHealth() - damage*discount <= 0;
} }
private float calculateRollXP(double damage, boolean isRoll) { private float calculateRollXP(double damage, boolean isRoll) {