Remove Moonrise utils to MCUtils, remove duplicated/unused utils

1 files changed, 24 insertions, 0 deletions

diff --git a/patches/server/0800-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0800-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
new file mode 100644
index 0000000000..962917dab8
--- /dev/null
+++ b/patches/server/0800-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Warrior <[email protected]>
+Date: Mon, 27 Feb 2023 19:16:07 +0100
+Subject: [PATCH] Fix MC-157464 Prevent sleeping villagers moving towards food
+
+Fixes sleeping villagers moving to nearby food by adding an !isSleeping predicate
+
+Relevant links:
+https://bugs.mojang.com/browse/MC-157464
+https://github.com/PaperMC/Paper/issues/8569
+
+diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
+index 5a18bf854792339fcd54e32f8053d014f3d195a5..f000a6c1e61198e6dd06ae5f084d12fdf309f50a 100644
+--- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
++++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java
+@@ -38,7 +38,7 @@ public class VillagerGoalPackages {
+             Pair.of(1, new MoveToTargetSink()),
+             Pair.of(2, PoiCompetitorScan.create()),
+             Pair.of(3, new LookAndFollowTradingPlayerSink(speed)),
+-            Pair.of(5, GoToWantedItem.create(speed, false, 4)),
++            Pair.of(5, GoToWantedItem.create(villager -> !villager.isSleeping(), speed, false, 4)), // Paper - Fix MC-157464
+             Pair.of(
+                 6, AcquirePoi.create(profession.acquirableJobSite(), MemoryModuleType.JOB_SITE, MemoryModuleType.POTENTIAL_JOB_SITE, true, Optional.empty())
+             ),