mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-29 11:59:24 +00:00
f5b95a6716
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b0da38c2 Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939) PaperMC/Paper@1922be90 Update custom tags (#12183) PaperMC/Paper@79cf1353 Ignore HopperInventorySearchEvent when it has no listeners (#13009) PaperMC/Paper@ea014f7a feat: add stuckEntityPoiRetryDelay config (#12949) PaperMC/Paper@a9e76749 Support for showNotification in PlayerRecipeDiscoverEvent (#12992) PaperMC/Paper@5622c9dd Expose attribute sentiment (#12974) PaperMC/Paper@42b653b1 Expose more argument types (#12665) PaperMC/Paper@52d9a221 [ci/skip] Fix typo in Display javadoc (#13010) PaperMC/Paper@614e9acf Improve APIs around riptide tridents (#12996) PaperMC/Paper@51706e5a Fixed DyeItem sheep dye hunk
41 lines
2.3 KiB
Diff
41 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Mon, 12 May 2025 19:39:03 +0200
|
|
Subject: [PATCH] Remove streams in TemptingSensor
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/ai/sensing/TemptingSensor.java b/net/minecraft/world/entity/ai/sensing/TemptingSensor.java
|
|
index 6074c091d0df7843c9f9dc691703eba1a24a7253..5919192968d7272bbf119f248def7e96a1ea359b 100644
|
|
--- a/net/minecraft/world/entity/ai/sensing/TemptingSensor.java
|
|
+++ b/net/minecraft/world/entity/ai/sensing/TemptingSensor.java
|
|
@@ -28,15 +28,21 @@ public class TemptingSensor extends Sensor<PathfinderMob> {
|
|
protected void doTick(ServerLevel level, PathfinderMob entity) {
|
|
Brain<?> brain = entity.getBrain();
|
|
TargetingConditions targetingConditions = TEMPT_TARGETING.copy().range((float)entity.getAttributeValue(Attributes.TEMPT_RANGE));
|
|
- List<Player> list = level.players()
|
|
- .stream()
|
|
- .filter(EntitySelector.NO_SPECTATORS)
|
|
- .filter(serverPlayer -> targetingConditions.test(level, entity, serverPlayer))
|
|
- .filter(this::playerHoldingTemptation)
|
|
- .filter(serverPlayer -> !entity.hasPassenger(serverPlayer))
|
|
- .sorted(Comparator.comparingDouble(entity::distanceToSqr))
|
|
- .collect(Collectors.toList());
|
|
+ // Leaf start - Remove streams in TemptingSensor
|
|
+ List<net.minecraft.server.level.ServerPlayer> allPlayers = level.players();
|
|
+ List<Player> list = new java.util.ArrayList<>();
|
|
+ for (Player serverPlayer : allPlayers) {
|
|
+ if (EntitySelector.NO_SPECTATORS.test(serverPlayer) &&
|
|
+ targetingConditions.test(level, entity, serverPlayer) &&
|
|
+ this.playerHoldingTemptation(serverPlayer) &&
|
|
+ !entity.hasPassenger(serverPlayer)) {
|
|
+ list.add(serverPlayer);
|
|
+ }
|
|
+ }
|
|
+ // Leaf end - Remove streams in TemptingSensor
|
|
+
|
|
if (!list.isEmpty()) {
|
|
+ list.sort(Comparator.comparingDouble(entity::distanceToSqr)); // Leaf - Remove streams in TemptingSensor
|
|
Player player = list.get(0);
|
|
// CraftBukkit start
|
|
org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(
|