Fixed Villager levelup issues. Closes #239

TeamMetallurgy · May 14, 2021 · e9b19e4 · e9b19e4
1 parent b673980
commit e9b19e4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/com/teammetallurgy/atum/entity/ai/brain/task/AtumChangeJobTask.java b/src/main/java/com/teammetallurgy/atum/entity/ai/brain/task/AtumChangeJobTask.java
@@ -30,7 +30,7 @@ protected boolean shouldExecute(@Nonnull ServerWorld world, @Nonnull VillagerEnt
     @Override
     protected void startExecuting(@Nonnull ServerWorld world, @Nonnull VillagerEntity entity, long gameTime) {
         if (entity instanceof AtumVillagerEntity) {
-            entity.setVillagerData(((AtumVillagerEntity) entity).getAtumVillagerData().withProfession(AtumVillagerProfession.NONE.get()));
+            ((AtumVillagerEntity) entity).setAtumVillagerData(((AtumVillagerEntity) entity).getAtumVillagerData().withProfession(AtumVillagerProfession.NONE.get()));
             entity.resetBrain(world);
         }
     }

diff --git a/src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerData.java b/src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerData.java
@@ -29,7 +29,7 @@ public class AtumVillagerData extends VillagerData { //Same as vanilla VillagerD
     public AtumVillagerData(AtumVillagerProfession profession, int level, Race race) {
         super(null, null, level);
         this.profession = profession;
-        this.level = level;
+        this.level = Math.max(1, level);
         this.race = race;
     }
 

diff --git a/src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerEntity.java b/src/main/java/com/teammetallurgy/atum/entity/villager/AtumVillagerEntity.java
@@ -216,7 +216,7 @@ public Entity changeDimension(@Nonnull ServerWorld server, @Nonnull ITeleporter
     @Deprecated
     //Use getAtumVillagerData
     public VillagerData getVillagerData() {
-        return null;
+        return getAtumVillagerData();
     }
 
     public AtumVillagerData getAtumVillagerData() {
@@ -227,8 +227,6 @@ public AtumVillagerData getAtumVillagerData() {
     public void setVillagerData(@Nonnull VillagerData data) {
         if (data instanceof AtumVillagerData) {
             this.setAtumVillagerData((AtumVillagerData) data);
-        } else {
-            Atum.LOG.debug("VillagerData present, but shouldn't be.");
         }
         //Ignore places where vanilla sets villager data
     }