From 745c836a09e9351137e5c572bf324cdc71ea1e81 Mon Sep 17 00:00:00 2001 From: ChromMob Date: Wed, 1 Jan 2025 10:41:45 +0100 Subject: [PATCH] Move the comment up --- .../entity/ai/behavior/PoiCompetitorScan.java.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java.patch index d7dcb2387a546..317c27e164188 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java.patch @@ -1,10 +1,11 @@ --- a/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java +++ b/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java -@@ -17,18 +_,33 @@ +@@ -17,21 +_,36 @@ instance -> instance.group(instance.present(MemoryModuleType.JOB_SITE), instance.present(MemoryModuleType.NEAREST_LIVING_ENTITIES)) .apply( instance, - (jobSite, nearestLivingEntities) -> (level, villager, gameTime) -> { ++ // Paper start - Improve performance of PoiCompetitorScan by unrolling stream + (jobSite, nearestLivingEntities) -> (level, villagerA, gameTime) -> { GlobalPos globalPos = instance.get(jobSite); level.getPoiManager() @@ -18,7 +19,6 @@ - .filter(v -> competesForSameJobsite(globalPos, poi, v)) - .reduce(villager, PoiCompetitorScan::selectWinner) + poi -> { -+ // Paper start - Improve performance of PoiCompetitorScan by unrolling stream + List livingEntities = instance.get(nearestLivingEntities); + + Villager winner = villagerA; @@ -37,8 +37,11 @@ + } + winner = selectWinner(winner, villagerB); + } -+ // Paper end - Improve performance of PoiCompetitorScan by unrolling stream + } ); return true; } ++ // Paper end - Improve performance of PoiCompetitorScan by unrolling stream + ) + ); + }