Remove zombie armour. Add back in default drops for picked up items.

NerdNu · Aug 5, 2017 · 08adcbe · 08adcbe
1 parent 208a2f6
commit 08adcbe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>nu.nerd</groupId>
 	<name>BeastMaster</name>
 	<artifactId>${project.name}</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.2</version>
 	<packaging>jar</packaging>
 	<description>Handles custom mob spawning.</description>
 	<url>https://github.com/NerdNu/${project.name}</url>

diff --git a/src/nu/nerd/beastmaster/BeastMaster.java b/src/nu/nerd/beastmaster/BeastMaster.java
@@ -243,7 +243,6 @@ public void onEntityDeath(EntityDeathEvent event) {
         // To do better than this, we need persistent metadata. *sigh*
         MobType mobType = MOBS.getMobType(monster);
         if (mobType != null) {
-            event.getDrops().clear();
             mobType.getDropSet().drop(loc);
         }
     } // onEntityDeath

diff --git a/src/nu/nerd/beastmaster/MobType.java b/src/nu/nerd/beastmaster/MobType.java
@@ -118,6 +118,12 @@ public void configureMob(LivingEntity mob) {
             maxHealth.setBaseValue(_health);
             mob.setHealth(_health);
         }
+
+        // Clear default armour.
+        mob.getEquipment().setHelmet(null);
+        mob.getEquipment().setChestplate(null);
+        mob.getEquipment().setLeggings(null);
+        mob.getEquipment().setBoots(null);
     }
 
     // ------------------------------------------------------------------------