Port PRs to 1.21

Improve Itemlookup performance when searching for a stack within a list Improve citizen Interact goal performance, it now uses our already existing custom lookat goal Fix Ship raids no longer spawning, being always overtaken by underwater raiders, now it is 20% for underwater raiders chance(except for underwater spawnpoints ofc) Fix entity registration check, forge field is unreliable as it gets reset on player visual tracking radius Fix visitor NPE when they have no home building Fix some enchanter scrolls saving the colony name to nbt Improve backup loading Fix sleeping citizens spawning in bad locations Improved refreshdimension entity movement Improved Spawnlocation util
ldtteam · Oct 23, 2024 · 63ff88b · 63ff88b
1 parent 82bc368
commit 63ff88b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/minecolonies/core/commands/citizencommands/CommandCitizenInfo.java b/src/main/java/com/minecolonies/core/commands/citizencommands/CommandCitizenInfo.java
@@ -89,12 +89,12 @@ public int onExecute(final CommandContext<CommandSourceStack> context)
         context.getSource().sendSuccess(() -> Component.translatableEscape(CommandTranslationConstants.COMMAND_CITIZEN_INFO_HEALTH, entityCitizen.getHealth(), entityCitizen.getMaxHealth()), true);
 
         Object[] skills =
-          new Object[] {citizenData.getCitizenSkillHandler().getSkills().get(Skill.Athletics).getA(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Dexterity).getA(),
-            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Strength).getA(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Agility).getA(),
-            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Stamina).getA(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Mana).getA(),
-            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Adaptability).getA(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Focus).getA(),
-            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Creativity).getA(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Knowledge).getA(),
-            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Intelligence).getA()};
+          new Object[] {citizenData.getCitizenSkillHandler().getSkills().get(Skill.Athletics).getLevel(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Dexterity).getLevel(),
+            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Strength).getLevel(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Agility).getLevel(),
+            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Stamina).getLevel(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Mana).getLevel(),
+            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Adaptability).getLevel(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Focus).getLevel(),
+            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Creativity).getLevel(), citizenData.getCitizenSkillHandler().getSkills().get(Skill.Knowledge).getLevel(),
+            citizenData.getCitizenSkillHandler().getSkills().get(Skill.Intelligence).getLevel()};
         context.getSource().sendSuccess(() -> Component.translatableEscape(CommandTranslationConstants.COMMAND_CITIZEN_INFO_SKILLS, skills), true);
 
         if (entityCitizen.getCitizenJobHandler().getColonyJob() == null)

diff --git a/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java b/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java
@@ -1319,7 +1319,7 @@ public boolean hurt(@NotNull final DamageSource damageSource, final float damage
             Log.getLogger()
               .warn("Entity:" + getName().toString() + " uuid:" + getUUID() + " id:" + getId() + " removed:" + isRemoved() + " colonyid:" + citizenColonyHandler.getColonyId()
                       + " entitydata colony id:" + getEntityData().get(DATA_COLONY_ID) + " hascolony:" + (citizenColonyHandler.getColony() != null) +
-                      " registered:" + citizenColonyHandler.registered() + " world:" + level + " saved data:" + tag);
+                      " registered:" + citizenColonyHandler.registered() + " world:" + level() + " saved data:" + tag);
         }
 
         if (handleInWallDamage(damageSource))