mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 02:49:19 +00:00
9a4efaa230
Originally vanilla logic is to use stream, and Mojang switched it to Guava's Collections2 since 1.21.4. It is much faster than using stream or manually adding to a new ArrayList. Manually adding to a new ArrayList requires allocating a new object array. However, the Collections2 lazy handles filter condition on iteration, so much better.
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(
|