ldtteam · Raycoms · Jun 8, 2025 · Jun 7, 2025 · Jun 7, 2025 · Jun 7, 2025
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuilding.java b/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuilding.java
@@ -1665,18 +1665,25 @@ public void cancelAllRequestsOfCitizen(@Nullable final ICitizenData data)
         final int citizenId = data == null ? -1 : data.getId();
         getOpenRequests(citizenId).forEach(request ->
         {
-            colony.getRequestManager().updateRequestState(request.getId(), RequestState.CANCELLED);
-
-            if (getOpenRequestsByRequestableType().containsKey(TypeToken.of(request.getRequest().getClass())))
+            try
             {
-                getOpenRequestsByRequestableType().get(TypeToken.of(request.getRequest().getClass())).remove(request.getId());
-                if (getOpenRequestsByRequestableType().get(TypeToken.of(request.getRequest().getClass())).isEmpty())
+                colony.getRequestManager().updateRequestState(request.getId(), RequestState.CANCELLED);
+
+                if (getOpenRequestsByRequestableType().containsKey(TypeToken.of(request.getRequest().getClass())))
                 {
-                    getOpenRequestsByRequestableType().remove(TypeToken.of(request.getRequest().getClass()));
+                    getOpenRequestsByRequestableType().get(TypeToken.of(request.getRequest().getClass())).remove(request.getId());
+                    if (getOpenRequestsByRequestableType().get(TypeToken.of(request.getRequest().getClass())).isEmpty())
+                    {
+                        getOpenRequestsByRequestableType().remove(TypeToken.of(request.getRequest().getClass()));
+                    }
                 }
-            }
 
-            getCitizensByRequest().remove(request.getId());
+                getCitizensByRequest().remove(request.getId());
+            }
+            catch (Exception ex)
+            {
+                Log.getLogger().error("Tried cancelling request of citizen but errored: " + (data == null ? -1 : data.getName()), ex);
+            }
         });
 
         getCompletedRequests(data).forEach(request -> colony.getRequestManager().updateRequestState(request.getId(), RequestState.RECEIVED));

diff --git a/src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingBaker.java b/src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingBaker.java
@@ -1,9 +1,13 @@
 package com.minecolonies.core.colony.buildings.workerbuildings;
 
 import com.google.common.collect.ImmutableSet;
+import com.minecolonies.api.colony.ICitizenData;
 import com.minecolonies.api.colony.IColony;
 import com.minecolonies.api.colony.IColonyManager;
 import com.minecolonies.api.colony.jobs.registry.JobEntry;
+import com.minecolonies.api.colony.requestsystem.request.IRequest;
+import com.minecolonies.api.colony.requestsystem.requestable.IRequestable;
+import com.minecolonies.api.colony.requestsystem.requestable.crafting.AbstractCrafting;
 import com.minecolonies.api.colony.requestsystem.token.IToken;
 import com.minecolonies.api.crafting.IGenericRecipe;
 import com.minecolonies.api.crafting.IRecipeStorage;
@@ -13,6 +17,7 @@
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
+import com.minecolonies.core.colony.jobs.AbstractJobCrafter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.item.ItemStack;
@@ -25,6 +30,7 @@
 import java.util.function.Predicate;
 
 import static com.minecolonies.api.util.constant.TagConstants.CRAFTING_BAKER;
+import static com.minecolonies.core.colony.buildings.modules.BuildingModules.BAKER_WORK;
 
 /**
  * Building for the bakery.
@@ -88,6 +94,33 @@ public boolean canEat(final ItemStack stack)
         {
             return false;
         }
+
+        final ICitizenData citizenData = getModule(BAKER_WORK).getFirstCitizen();
+        if (citizenData != null)
+        {
+            final IRequest<? extends IRequestable> currentTask = ((AbstractJobCrafter<?, ?>) citizenData.getJob()).getCurrentTask();
+            if (currentTask == null)
+            {
+                return super.canEat(stack);
+            }
+            final IRequestable request = currentTask.getRequest();
+            if (request instanceof AbstractCrafting craftingRequest)
+            {
+                final IRecipeStorage recipe = IColonyManager.getInstance().getRecipeManager().getRecipe(craftingRequest.getRecipeID());
+                if (recipe != null)
+                {
+                    if (recipe.getCleanedInput().contains(new ItemStorage(stack)))
+                    {
+                        return false;
+                    }
+
+                    if (ItemStack.isSameItem(recipe.getPrimaryOutput(), stack))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
         return super.canEat(stack);
     }
 

diff --git a/...main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingDeliveryman.java b/...main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingDeliveryman.java
@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import static com.minecolonies.api.util.constant.BuildingConstants.CONST_DEFAULT_MAX_BUILDING_LEVEL;
+import static com.minecolonies.core.colony.buildings.modules.BuildingModules.COURIER_WORK;
 
 /**
  * Class of the warehouse building.
@@ -50,7 +51,7 @@ public int getMaxBuildingLevel()
     @Override
     public boolean canEat(final ItemStack stack)
     {
-        final ICitizenData citizenData = getFirstModuleOccurance(WorkerBuildingModule.class).getFirstCitizen();
+        final ICitizenData citizenData = getModule(COURIER_WORK).getFirstCitizen();
         if (citizenData != null)
         {
             final JobDeliveryman job = (JobDeliveryman) citizenData.getJob();

diff --git a/src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingKitchen.java b/src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingKitchen.java
@@ -1,14 +1,23 @@
 package com.minecolonies.core.colony.buildings.workerbuildings;
 
+import com.minecolonies.api.colony.ICitizenData;
 import com.minecolonies.api.colony.IColony;
 import com.minecolonies.api.colony.IColonyManager;
 import com.minecolonies.api.colony.jobs.registry.JobEntry;
+import com.minecolonies.api.colony.requestsystem.request.IRequest;
+import com.minecolonies.api.colony.requestsystem.requestable.IRequestable;
+import com.minecolonies.api.colony.requestsystem.requestable.crafting.AbstractCrafting;
+import com.minecolonies.api.colony.requestsystem.requestable.crafting.PublicCrafting;
 import com.minecolonies.api.crafting.IGenericRecipe;
+import com.minecolonies.api.crafting.IRecipeStorage;
+import com.minecolonies.api.crafting.ItemStorage;
 import com.minecolonies.api.util.CraftingUtils;
 import com.minecolonies.api.util.FoodUtils;
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
+import com.minecolonies.core.colony.buildings.modules.WorkerBuildingModule;
+import com.minecolonies.core.colony.jobs.AbstractJobCrafter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -17,6 +26,7 @@
 
 import static com.minecolonies.api.util.constant.Suppression.OVERRIDE_EQUALS;
 import static com.minecolonies.api.util.constant.TagConstants.CRAFTING_COOK;
+import static com.minecolonies.core.colony.buildings.modules.BuildingModules.CHEF_WORK;
 
 /**
  * Class of the kitchen building.
@@ -58,6 +68,43 @@ public int getMaxBuildingLevel()
         return MAX_BUILDING_LEVEL;
     }
 
+    @Override
+    protected boolean keepFood()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean canEat(final ItemStack stack)
+    {
+        final ICitizenData citizenData = getModule(CHEF_WORK).getFirstCitizen();
+        if (citizenData != null)
+        {
+            final IRequest<? extends IRequestable> currentTask = ((AbstractJobCrafter<?, ?>) citizenData.getJob()).getCurrentTask();
+            if (currentTask == null)
+            {
+                return super.canEat(stack);
+            }
+            final IRequestable request = currentTask.getRequest();
+            if (request instanceof AbstractCrafting craftingRequest)
+            {
+                final IRecipeStorage recipe = IColonyManager.getInstance().getRecipeManager().getRecipe(craftingRequest.getRecipeID());
+                if (recipe != null)
+                {
+                    if (recipe.getCleanedInput().contains(new ItemStorage(stack)))
+                    {
+                        return false;
+                    }
+
+                    if (ItemStack.isSameItem(recipe.getPrimaryOutput(), stack))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        return super.canEat(stack);
+    }
 
     public static class CraftingModule extends AbstractCraftingBuildingModule.Crafting
     {

diff --git a/...m/minecolonies/core/colony/requestsystem/data/StandardRequestSystemBuildingDataStore.java b/...m/minecolonies/core/colony/requestsystem/data/StandardRequestSystemBuildingDataStore.java
@@ -83,7 +83,7 @@ public Map<IToken<?>, Integer> getCitizensByRequest()
     @Override
     public void moveToSyncCitizen(final ICitizenData citizenData, final IRequest<?> request)
     {
-        if (citizenByOpenRequest.containsKey(request.getId()))
+        if (citizenByOpenRequest.get(request.getId()) == -1)
         {
             citizenByOpenRequest.remove(request.getId());
             citizenByOpenRequest.put(request.getId(), citizenData.getId());