fixed #722

Luke100000 · Sep 10, 2023 · 402a07b · 402a07b
1 parent 99b60c0
commit 402a07b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/common/src/main/java/net/mca/Config.java b/common/src/main/java/net/mca/Config.java
@@ -58,9 +58,9 @@ public static Config getInstance() {
 
     //villager behavior
     public float twinBabyChance = 0.02f;
-    public float marriageHeartsRequirement = 100;
-    public float engagementHeartsRequirement = 50;
-    public float bouquetHeartsRequirement = 10;
+    public int marriageHeartsRequirement = 100;
+    public int engagementHeartsRequirement = 50;
+    public int bouquetHeartsRequirement = 10;
     public int babyItemGrowUpTime = 24000;
     public int villagerMaxAgeTime = 384000;
     public int villagerMaxHealth = 20;

diff --git a/common/src/main/java/net/mca/entity/VillagerEntityMCA.java b/common/src/main/java/net/mca/entity/VillagerEntityMCA.java
@@ -1453,7 +1453,7 @@ public static DefaultAttributeContainer.Builder createVillagerAttributes() {
 
     private void tickDespawnDelay() {
         if (this.despawnDelay > 0 && !this.hasCustomer() && --this.despawnDelay == 0) {
-            if (getVillagerBrain().getMemories().values().stream().anyMatch(m -> random.nextInt(100) < m.getHearts())) {
+            if (getRelationships().getPartner().isPresent() || getVillagerBrain().getMemories().values().stream().anyMatch(m -> random.nextInt(Config.getInstance().marriageHeartsRequirement) < m.getHearts())) {
                 setProfession(VillagerProfession.NONE);
                 setDespawnDelay(0);
             } else {

diff --git a/common/src/main/java/net/mca/item/BouquetItem.java b/common/src/main/java/net/mca/item/BouquetItem.java
@@ -12,7 +12,7 @@ public BouquetItem(Item.Settings properties) {
     }
 
     @Override
-    protected float getHeartsRequired() {
+    protected int getHeartsRequired() {
         return Config.getInstance().bouquetHeartsRequirement;
     }
 

diff --git a/common/src/main/java/net/mca/item/EngagementRingItem.java b/common/src/main/java/net/mca/item/EngagementRingItem.java
@@ -12,7 +12,7 @@ public EngagementRingItem(Settings properties) {
     }
 
     @Override
-    protected float getHeartsRequired() {
+    protected int getHeartsRequired() {
         return Config.getInstance().engagementHeartsRequirement;
     }
 

diff --git a/common/src/main/java/net/mca/item/RelationshipItem.java b/common/src/main/java/net/mca/item/RelationshipItem.java
@@ -11,7 +11,7 @@ public RelationshipItem(Settings properties) {
         super(properties);
     }
 
-    abstract float getHeartsRequired();
+    abstract int getHeartsRequired();
 
     @Override
     public boolean handle(ServerPlayerEntity player, VillagerEntityMCA villager) {

diff --git a/common/src/main/java/net/mca/item/WeddingRingItem.java b/common/src/main/java/net/mca/item/WeddingRingItem.java
@@ -12,7 +12,7 @@ public WeddingRingItem(Item.Settings properties) {
     }
 
      @Override
-    protected float getHeartsRequired() {
+    protected int getHeartsRequired() {
         return Config.getInstance().marriageHeartsRequirement;
     }