From 46120b8a0fe8f7cac7921615183142164a48bcd0 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sat, 8 Mar 2025 21:10:11 +0800 Subject: [PATCH] Fix allowBadOmenTriggerRaid --- .../minecraft-patches/features/0108-Revert-raid-changes.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leaves-server/minecraft-patches/features/0108-Revert-raid-changes.patch b/leaves-server/minecraft-patches/features/0108-Revert-raid-changes.patch index 4b100301..6117a3b7 100644 --- a/leaves-server/minecraft-patches/features/0108-Revert-raid-changes.patch +++ b/leaves-server/minecraft-patches/features/0108-Revert-raid-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Revert raid changes diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java -index 80f17f33f670018240c854df589cf90cdeab6e70..4dea5d3898c82c54e7c40a6946038fcef3366289 100644 +index 80f17f33f670018240c854df589cf90cdeab6e70..4c6ce6a4a730033802651b0c0052fc46edeed4d6 100644 --- a/net/minecraft/world/effect/BadOmenMobEffect.java +++ b/net/minecraft/world/effect/BadOmenMobEffect.java @@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect { @@ -14,7 +14,7 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..4dea5d3898c82c54e7c40a6946038fce && level.isVillage(serverPlayer.blockPosition())) { + // Leaves start - Revert raid changes + if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.raid.allowBadOmenTriggerRaid) { -+ return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) != null; ++ return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) == null; + } + // Leaves end - Revert raid changes Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());