Repo-Mirror/LuminolMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

feat: fixup full raid module

Browse Source
This commit is contained in:
Helvetica Volubi
2025-04-11 18:07:59 +08:00
parent 977ea4ce36
commit d75b16f37c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
luminol-server/minecraft-patches/features/0053-Leaves-Revert-raid-changes.patch
View File

@@ -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 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 --- a/net/minecraft/world/effect/BadOmenMobEffect.java
+++ b/net/minecraft/world/effect/BadOmenMobEffect.java +++ b/net/minecraft/world/effect/BadOmenMobEffect.java
@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect { @@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
@@ -14,14 +14,14 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..7976b9ae6688b9a07b2ad19d1af3670f
&& level.isVillage(serverPlayer.blockPosition())) { && level.isVillage(serverPlayer.blockPosition())) {
+ // Leaves start - Revert raid changes + // Leaves start - Revert raid changes
+ if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.trigger) { + 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 + // Leaves end - Revert raid changes
Raid raidAt = level.getRaidAt(serverPlayer.blockPosition()); Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());
if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) { if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier)); 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 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 --- a/net/minecraft/world/entity/raid/Raider.java
+++ b/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 { @@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster {
@@ -31,7 +31,7 @@ index 7c385baae81b9a987c0e1e4deb017884600331bc..d11fdae969241923c9a27b1aefac2308
+ +
+ // Leaves start - Revert raid changes + // Leaves start - Revert raid changes
+ if (this.level() instanceof ServerLevel serverLevel) { + 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); + ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
+ net.minecraft.world.entity.player.Player entityhuman = null; + net.minecraft.world.entity.player.Player entityhuman = null;
+ if (entity instanceof net.minecraft.world.entity.player.Player player) { + if (entity instanceof net.minecraft.world.entity.player.Player player) {

2
luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch
View File

@@ -11,7 +11,7 @@
+ @ConfigInfo(baseName = "allow-bad-omen-trigger-raid", comments = + @ConfigInfo(baseName = "allow-bad-omen-trigger-raid", comments =
+ """ + """
+ Allow players with ominous signs to\s + 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""") + attacks directly""")
+ public static boolean trigger = false; + public static boolean trigger = false;
+ +