EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-03 21:15:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

Browse Source
This commit is contained in:
nossr50
2020-07-30 13:18:20 -07:00
parent 2c64eadafa 9f9518eea0
commit 2020fdd4ea
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/skills/axes/Axes.java
View File

@@ -23,10 +23,13 @@ public class Axes {
public static double skullSplitterModifier = AdvancedConfig.getInstance().getSkullSplitterModifier();
protected static boolean hasArmor(LivingEntity target) {
if(target.getEquipment() == null)
if(target == null || !target.isValid() || target.getEquipment() == null)
return false;
for (ItemStack itemStack : target.getEquipment().getArmorContents()) {
if(itemStack == null)
continue;
if (ItemUtils.isArmor(itemStack)) {
return true;
}