mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-20 15:39:37 +00:00
d06fb16da3
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@30fdfb1a [ci/skip] Fix docs for DamageResistant (#11992) PaperMC/Paper@6b7650d8 Only add goat horn once (#12001) PaperMC/Paper@30046e04 Fix a rare crash with a concurrent modification of scaled health attributes (#12002) PaperMC/Paper@88bbead1 Flush regionfiles on save configuration option PaperMC/Paper@336ea9df Check for empty when sending equipment changes (#12008) PaperMC/Paper@939bb782 Add RayTraceConfigurationBuilder (#11907) PaperMC/Paper@81bb82f5 Fix wrong piston world border check (#12007) PaperMC/Paper@ce95b5d6 Use proper default for setting null display background color (#12010) PaperMC/Paper@2477f1f6 [ci/skip] fix and improvements for docs in ConsumeEffect component (#11998) PaperMC/Paper@fb5b173c Add PlayerClientLoadedWorldEvent (#11940) PaperMC/Paper@3af5e771 Add Player#give (#11995) PaperMC/Paper@7e21cb81 fix PlayerChangedMainHandEvent javadoc (#12020) PaperMC/Paper@5a34bf04 Correctly retrun true for empty input shapes in EntityGetter#isUnobstructed PaperMC/Paper@a392d475 Make Watchdog thread extend TickThread Gale Changes: Dreeam-qwq/Gale@f9080a7e Updated Upstream (Paper) Dreeam-qwq/Gale@ff0596c1 [ci/skip] Fix upstream commit sh on mac Dreeam-qwq/Gale@24970274 [ci/skip] Hermanez - Wutaf Dreeam-qwq/Gale@85eabf60 [ci/skip] cleanup Dreeam-qwq/Gale@7d9faf00 [ci/skip] cleanup & drop xor-shift random Dreeam-qwq/Gale@7af04981 [ci/skip] cleanup Dreeam-qwq/Gale@4d5d39df [ci/skip] Remove useless params standardize in upstream commit generator Dreeam-qwq/Gale@964f16ff Updated Upstream (Paper) Dreeam-qwq/Gale@0566a223 [ci/skip] cleanup Dreeam-qwq/Gale@5e3f6740 [ci/skip] cleanup work finished Dreeam-qwq/Gale@98a66cfb Updated Upstream (Paper) Dreeam-qwq/Gale@f7736578 [ci/skip] Update upstreamCommit.sh Dreeam-qwq/Gale@1c46c816 Updated Upstream (Paper) Dreeam-qwq/Gale@2b0a4c09 [ci/skip] Skip tests during auto update validate phase Purpur Changes: PurpurMC/Purpur@4a0a86b9 Updated Upstream (Paper) PurpurMC/Purpur@7399988c Fix hover in /plugins PurpurMC/Purpur@5e5857dc [ci/skip] modify ci skip references in paper upstream commits PurpurMC/Purpur@5583a3f1 Updated Upstream (Paper)
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
|
Date: Sat, 26 Oct 2024 00:56:24 +0800
|
|
Subject: [PATCH] Remove stream in BehaviorUtils
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
index e7f74b4f54069ffdf74f029639cbf0756f2db095..b5257eefa04e930b45ffd9d46f28e53026ad728f 100644
|
|
--- a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
@@ -110,10 +110,33 @@ public class BehaviorUtils {
|
|
|
|
public static SectionPos findSectionClosestToVillage(ServerLevel serverLevel, SectionPos sectionPos, int radius) {
|
|
int i = serverLevel.sectionsToVillage(sectionPos);
|
|
- return SectionPos.cube(sectionPos, radius)
|
|
- .filter(pos -> serverLevel.sectionsToVillage(pos) < i)
|
|
- .min(Comparator.comparingInt(serverLevel::sectionsToVillage))
|
|
- .orElse(sectionPos);
|
|
+ // Leaf start - Remove stream in BehaviorUtils
|
|
+ SectionPos closestSection = sectionPos;
|
|
+ int closestDistance = i;
|
|
+
|
|
+ final int lowerX = sectionPos.getX() - radius;
|
|
+ final int lowerY = sectionPos.getY() - radius;
|
|
+ final int lowerZ = sectionPos.getZ() - radius;
|
|
+ final int upperX = sectionPos.getX() + radius;
|
|
+ final int upperY = sectionPos.getY() + radius;
|
|
+ final int upperZ = sectionPos.getZ() + radius;
|
|
+
|
|
+ for (int x = lowerX; x <= upperX; x++) {
|
|
+ for (int z = lowerZ; z <= upperZ; z++) {
|
|
+ for (int y = lowerY; y <= upperY; y++) {
|
|
+ SectionPos pos = SectionPos.of(x, y, z);
|
|
+ int distance = serverLevel.sectionsToVillage(pos);
|
|
+
|
|
+ if (distance < closestDistance) {
|
|
+ closestDistance = distance;
|
|
+ closestSection = pos;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return closestSection;
|
|
+ // Leaf end - Remove stream in BehaviorUtils
|
|
}
|
|
|
|
public static boolean isWithinAttackRange(Mob mob, LivingEntity target, int cooldown) {
|