move soundsource, prob fixes 10644 (#10645)

Move soundsource of raid source to hostile Fix concrete mixer issue Remove extra food handout Fix standup/sitdown loop at restaurant
ldtteam · Feb 9, 2025 · d5d1aa8 · d5d1aa8
1 parent 36d5573
commit d5d1aa8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/src/main/java/com/minecolonies/core/colony/events/raid/HordeRaidEvent.java b/src/main/java/com/minecolonies/core/colony/events/raid/HordeRaidEvent.java
@@ -361,7 +361,7 @@ public void onStart()
           .forManagers();
         Log.getLogger().debug("Raiders coming from: " + spawnPoint.toShortString() + " towards colony: " + colony.getName());
 
-        PlayAudioMessage audio = new PlayAudioMessage(horde.initialSize <= SMALL_HORDE_SIZE ? RaidSounds.WARNING_EARLY : RaidSounds.WARNING, SoundSource.RECORDS);
+        PlayAudioMessage audio = new PlayAudioMessage(horde.initialSize <= SMALL_HORDE_SIZE ? RaidSounds.WARNING_EARLY : RaidSounds.WARNING, SoundSource.HOSTILE);
         PlayAudioMessage.sendToAll(getColony(), false, false, audio);
     }
 

diff --git a/src/main/java/com/minecolonies/core/colony/events/raid/RaidManager.java b/src/main/java/com/minecolonies/core/colony/events/raid/RaidManager.java
@@ -1054,7 +1054,7 @@ public void onRaidEventFinished(final IColonyRaidEvent finishedRaid)
             MessageUtils.format(msgID, colony.getName()).sendTo(colony).forManagers();
         }
 
-        PlayAudioMessage audio = new PlayAudioMessage(raidHistories.get(0).raiderAmount <= SMALL_HORDE_SIZE ? RaidSounds.VICTORY_EARLY : RaidSounds.VICTORY, SoundSource.RECORDS);
+        PlayAudioMessage audio = new PlayAudioMessage(raidHistories.get(0).raiderAmount <= SMALL_HORDE_SIZE ? RaidSounds.VICTORY_EARLY : RaidSounds.VICTORY, SoundSource.HOSTILE);
         PlayAudioMessage.sendToAll(colony, false, true, audio);
 
         if (colony.getRaiderManager().getLostCitizen() == 0)

diff --git a/src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAIEatTask.java b/src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAIEatTask.java
@@ -257,9 +257,8 @@ private EatingState getFoodYourself()
             final ItemStorage storageToGet = FoodUtils.checkForFoodInBuilding(citizen.getCitizenData(), cookBuilding.getModule(RESTAURANT_MENU).getMenu(), cookBuilding);
             if (storageToGet != null)
             {
-                int homeBuildingLevel = citizen.getCitizenData().getHomeBuilding() == null ? 1 : citizen.getCitizenData().getHomeBuilding().getBuildingLevel();
                 int qty = (int) (Math.max(1.0,
-                    (FULL_SATURATION - citizen.getCitizenData().getSaturation()) / FoodUtils.getFoodValue(storageToGet.getItemStack(), citizen) * homeBuildingLevel / 2.0));
+                    (FULL_SATURATION - citizen.getCitizenData().getSaturation()) / FoodUtils.getFoodValue(storageToGet.getItemStack(), citizen)));
                 InventoryUtils.transferItemStackIntoNextBestSlotInItemHandler(cookBuilding, storageToGet, qty, citizen.getInventoryCitizen());
                 return EAT;
             }

diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/crafting/EntityAIConcreteMixer.java b/src/main/java/com/minecolonies/core/entity/ai/workers/crafting/EntityAIConcreteMixer.java
@@ -123,6 +123,11 @@ private IAIState harvestConcrete()
                 job.setCraftCounter(job.getCraftCounter() + 1);
                 if (job.getCraftCounter() >= job.getMaxCraftingCount())
                 {
+                    incrementActionsDone(getActionRewardForCraftingSuccess());
+                    worker.decreaseSaturationForAction();
+                    job.finishRequest(true);
+                    worker.getCitizenExperienceHandler().addExperience(currentRequest.getRequest().getCount() / 2.0);
+                    currentRequest = null;
                     currentRecipeStorage = null;
                     resetValues();
 
@@ -165,12 +170,7 @@ private int getSlotWithPowder()
     @Override
     protected IAIState decide()
     {
-        if (job.getCurrentTask() == null)
-        {
-            return performMixingWork();
-        }
-
-        if (walkTo == null && !walkToBuilding())
+        if ((walkTo == null && !walkToBuilding()) || job.getCurrentTask() == null)
         {
             return START_WORKING;
         }
@@ -198,7 +198,7 @@ protected int getExtendedCount(final ItemStack primaryOutput)
     @Override
     protected IAIState craft()
     {
-        if (currentRecipeStorage == null)
+        if (currentRecipeStorage == null || job.getCurrentTask() == null)
         {
             return START_WORKING;
         }

diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkCook.java b/src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkCook.java
@@ -225,8 +225,7 @@ else if (InventoryUtils.hasItemInItemHandler(handler, canEatPredicate))
         }
 
         final int countInSlot = worker.getInventoryCitizen().getStackInSlot(foodSlot).getCount();
-        int homeBuildingLevel = citizen.getCitizenData().getHomeBuilding() == null ? 1 : citizen.getCitizenData().getHomeBuilding().getBuildingLevel();
-        int qty = (int) (Math.max(1.0, (FULL_SATURATION - citizen.getCitizenData().getSaturation()) / FoodUtils.getFoodValue(worker.getInventoryCitizen().getStackInSlot(foodSlot), citizen)) * homeBuildingLevel/2.0);
+        int qty = (int) (Math.max(1.0, (FULL_SATURATION - citizen.getCitizenData().getSaturation()) / FoodUtils.getFoodValue(worker.getInventoryCitizen().getStackInSlot(foodSlot), citizen)));
 
         final int transferCount = Math.min(countInSlot, building.getBuildingLevel());
         if (InventoryUtils.transferXOfItemStackIntoNextFreeSlotInItemHandler(worker.getInventoryCitizen(), foodSlot, qty, citizenData.getInventory()))

diff --git a/...com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java b/...com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java
@@ -1057,18 +1057,17 @@ public void stop()
             pathResult.cancel();
             pathResult.setStatus(PathFindingStatus.CANCELLED);
             pathResult = null;
+            if (ourEntity.getVehicle() != null)
+            {
+                final Entity entity = ourEntity.getVehicle();
+                ourEntity.stopRiding();
+                entity.remove(Entity.RemovalReason.DISCARDED);
+            }
         }
 
         safeDestinationPos = BlockPos.ZERO;
         stuckHandler.resetGlobalStuckTimers();
 
-        if (ourEntity.vehicle != null)
-        {
-            final Entity entity = ourEntity.vehicle;
-            ourEntity.stopRiding();
-            entity.remove(Entity.RemovalReason.DISCARDED);
-        }
-
         super.stop();
     }