Remove zombie-specific profession from VillagerProfession

CitizensDev · Aug 19, 2016 · d9f31ff · d9f31ff
1 parent 73854b8
commit d9f31ff
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java b/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
@@ -20,15 +20,19 @@ public VillagerProfession() {
     public void load(DataKey key) throws NPCLoadException {
         try {
             profession = Profession.valueOf(key.getString(""));
+            if (profession == Profession.NORMAL) {
+                profession = Profession.FARMER;
+            }
         } catch (IllegalArgumentException ex) {
             throw new NPCLoadException("Invalid profession.");
         }
     }
 
     @Override
     public void onSpawn() {
-        if (npc.getEntity() instanceof Villager)
+        if (npc.getEntity() instanceof Villager) {
             ((Villager) npc.getEntity()).setProfession(profession);
+        }
     }
 
     @Override
@@ -37,9 +41,13 @@ public void save(DataKey key) {
     }
 
     public void setProfession(Profession profession) {
+        if (profession == Profession.NORMAL) {
+            profession = Profession.FARMER;
+        }
         this.profession = profession;
-        if (npc.getEntity() instanceof Villager)
+        if (npc.getEntity() instanceof Villager) {
             ((Villager) npc.getEntity()).setProfession(profession);
+        }
     }
 
     @Override