Merge branch '1.9' into 1.9.4

# Conflicts: # src/main/java/info/ata4/minecraft/dragon/server/entity/ai/EntityAIDragonCatchOwner.java
ata4 · Jun 8, 2016 · cb29a26 · cb29a26
2 parents 46ad9ba + 0d9363a
commit cb29a26
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 42 deletions.
diff --git a/src/main/java/info/ata4/minecraft/dragon/server/entity/ai/EntityAIDragonCatchOwner.java b/src/main/java/info/ata4/minecraft/dragon/server/entity/ai/EntityAIDragonCatchOwner.java
@@ -55,7 +55,7 @@ public boolean shouldExecute() {
         // don't catch if owner has a working Elytra equipped
         // note: isBroken() is misleading, it actually checks if the items is usable
         ItemStack itemStack = owner.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
-        if (itemStack.getItem() == Items.ELYTRA && ItemElytra.isBroken(itemStack)) {
+        if (itemStack != null && itemStack.getItem() == Items.ELYTRA && ItemElytra.isBroken(itemStack)) {
             return false;
         }
 

diff --git a/...in/java/info/ata4/minecraft/dragon/server/entity/ai/ground/EntityAIDragonFollowOwner.java b/...in/java/info/ata4/minecraft/dragon/server/entity/ai/ground/EntityAIDragonFollowOwner.java