Fix null check errors with checking for Infinity/Mending knockoff.

This commit is contained in:
sigonasr2 2016-09-20 06:01:24 -05:00
parent f414fdbb68
commit 9b5d4015a3
2 changed files with 1 additions and 1 deletions

Binary file not shown.

View File

@ -502,7 +502,7 @@ public class CustomDamage {
increaseSwordComboCount(weapon, p); increaseSwordComboCount(weapon, p);
} }
performMegaKnockback(damager,target); performMegaKnockback(damager,target);
if (damager instanceof Arrow || weapon.getType()!=Material.BOW) { if ((damager!=null && damager instanceof Arrow) || (weapon!=null && weapon.getType()!=Material.BOW)) {
removePermEnchantments(p,weapon); removePermEnchantments(p,weapon);
} }
//GenericFunctions.knockOffGreed(p); //GenericFunctions.knockOffGreed(p);