mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-28 03:19:22 +00:00
20 lines
1.2 KiB
Diff
20 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 9 Jul 2023 16:51:47 +0800
|
|
Subject: [PATCH] Raider die skip self raid check
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
|
|
index 57fdcdaf54fd1c92a6e51a3a81789029096e5abe..1b8e141e50dd2a156eda2455988ea45a390692ae 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
|
|
@@ -134,7 +134,7 @@ public abstract class Raider extends PatrollingMonster {
|
|
raid.removeFromRaid(this, false);
|
|
}
|
|
|
|
- if (this.isPatrolLeader() && raid == null && ((ServerLevel) this.level()).getRaidAt(this.blockPosition()) == null) {
|
|
+ if (this.isPatrolLeader() && (top.leavesmc.leaves.LeavesConfig.skipSelfRaidCheck || raid == null) && ((ServerLevel) this.level()).getRaidAt(this.blockPosition()) == null) { // Leaves - skip self raid check
|
|
ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
|
|
Player entityhuman = null;
|
|
|