diff --git a/luminol-server/minecraft-patches/features/0053-Leaves-Revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0053-Leaves-Revert-raid-changes.patch index f66657b..c531e52 100644 --- a/luminol-server/minecraft-patches/features/0053-Leaves-Revert-raid-changes.patch +++ b/luminol-server/minecraft-patches/features/0053-Leaves-Revert-raid-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves-Revert-raid-changes diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java -index 80f17f33f670018240c854df589cf90cdeab6e70..7976b9ae6688b9a07b2ad19d1af3670fe06a0b63 100644 +index 80f17f33f670018240c854df589cf90cdeab6e70..8672757a4d5fb5c247599782fece6b8d7d6ec921 100644 --- a/net/minecraft/world/effect/BadOmenMobEffect.java +++ b/net/minecraft/world/effect/BadOmenMobEffect.java @@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect { @@ -14,14 +14,14 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..7976b9ae6688b9a07b2ad19d1af3670f && level.isVillage(serverPlayer.blockPosition())) { + // Leaves start - Revert raid changes + if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.trigger) { -+ 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()); if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) { serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier)); diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java -index 7c385baae81b9a987c0e1e4deb017884600331bc..d11fdae969241923c9a27b1aefac23088cd0a5b8 100644 +index 7c385baae81b9a987c0e1e4deb017884600331bc..a0d86c3cc86da734a3cd10d554aaecb5c0b82e59 100644 --- a/net/minecraft/world/entity/raid/Raider.java +++ b/net/minecraft/world/entity/raid/Raider.java @@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster { @@ -31,16 +31,16 @@ index 7c385baae81b9a987c0e1e4deb017884600331bc..d11fdae969241923c9a27b1aefac2308 + + // Leaves start - Revert raid changes + if (this.level() instanceof ServerLevel serverLevel) { -+ if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.effect && raid == null && serverLevel.getRaidAt(this.blockPosition()) == null) { ++ if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.effect && !this.hasRaid()) { + ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); + net.minecraft.world.entity.player.Player entityhuman = null; + if (entity instanceof net.minecraft.world.entity.player.Player player) { + entityhuman = player; + } else if (entity instanceof net.minecraft.world.entity.animal.Wolf wolf) { -+ LivingEntity entityliving = wolf.getOwner(); -+ if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) { -+ entityhuman = player; -+ } ++ LivingEntity entityliving = wolf.getOwner(); ++ if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) { ++ entityhuman = player; ++ } + } + + if (entityhuman != null && !itemstack.isEmpty() && this.isCaptain()) { diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch index 3423797..1b2e225 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch @@ -11,7 +11,7 @@ + @ConfigInfo(baseName = "allow-bad-omen-trigger-raid", comments = + """ + Allow players with ominous signs to\s -+ skip a 30 second cooldown and trigger\s ++ skip a 30-second cooldown and trigger\s + attacks directly""") + public static boolean trigger = false; +