Post merge fixes

ldtteam · Nov 28, 2024 · c2f25b8 · c2f25b8
1 parent c3b8c18
commit c2f25b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...main/java/com/minecolonies/api/entity/citizen/citizenhandlers/ICitizenDiseaseHandler.java b/...main/java/com/minecolonies/api/entity/citizen/citizenhandlers/ICitizenDiseaseHandler.java
@@ -75,5 +75,5 @@ public interface ICitizenDiseaseHandler
      * Set a disease on the citizen.
      * @param disease to set.
      */
-    void setDisease(String disease);
+    void setDisease(Disease disease);
 }
diff --git a/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java b/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java
@@ -49,6 +49,7 @@
 import com.minecolonies.core.colony.jobs.JobKnight;
 import com.minecolonies.core.colony.jobs.JobNetherWorker;
 import com.minecolonies.core.colony.jobs.JobRanger;
+import com.minecolonies.core.datalistener.DiseasesListener;
 import com.minecolonies.core.entity.ai.minimal.*;
 import com.minecolonies.core.entity.ai.workers.AbstractEntityAIBasic;
 import com.minecolonies.core.entity.ai.workers.CitizenAI;
@@ -487,7 +488,7 @@ private InteractionResult directPlayerInteraction(final Player player, final Int
 
             if (!level.isClientSide())
             {
-                getCitizenData().getCitizenDiseaseHandler().setDisease(IColonyManager.getInstance().getCompatibilityManager().getRandomDisease());
+                getCitizenData().getCitizenDiseaseHandler().setDisease(DiseasesListener.getRandomDisease(getRandom()));
                 playSound(SoundEvents.VILLAGER_HURT, 1.0f, (float) SoundUtils.getRandomPitch(getRandom()));
                 getCitizenData().markDirty(20);
 

diff --git a/...main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenDiseaseHandler.java b/...main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenDiseaseHandler.java
@@ -4,6 +4,7 @@
 import com.minecolonies.api.colony.ICitizenData;
 import com.minecolonies.api.colony.IColony;
 import com.minecolonies.api.colony.buildings.IBuilding;
+import com.minecolonies.api.entity.citizen.AbstractEntityCitizen;
 import com.minecolonies.api.entity.citizen.citizenhandlers.ICitizenDiseaseHandler;
 import com.minecolonies.core.MineColonies;
 import com.minecolonies.core.colony.buildings.workerbuildings.BuildingCook;
@@ -14,7 +15,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
+import net.minecraft.util.RandomSource;
 import org.jetbrains.annotations.Nullable;
 
 import static com.minecolonies.api.research.util.ResearchConstants.MASKS;
@@ -102,7 +103,7 @@ public void update(final int tickRate)
 
             if (citizenData.getRandom().nextInt(configModifier * DISEASE_FACTOR) < citizenModifier * 10)
             {
-                this.disease = DiseasesListener.getRandomDisease(citizen.getRandom());
+                this.disease = DiseasesListener.getRandomDisease(citizenData.getEntity().map(AbstractEntityCitizen::getRandom).orElse(RandomSource.create()));
             }
         }