-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve performance of PoiCompetitorScan by unrolling stream (#11871)
- Loading branch information
Showing
1 changed file
with
42 additions
and
0 deletions.
There are no files selected for viewing
42 changes: 42 additions & 0 deletions
42
...erver/patches/sources/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- a/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java | ||
| +++ b/net/minecraft/world/entity/ai/behavior/PoiCompetitorScan.java | ||
| @@ -22,13 +_,32 @@ | ||
| level.getPoiManager() | ||
| .getType(globalPos.pos()) | ||
| .ifPresent( | ||
| - poi -> instance.<List<LivingEntity>>get(nearestLivingEntities) | ||
| - .stream() | ||
| - .filter(entity -> entity instanceof Villager && entity != villager) | ||
| - .map(entity -> (Villager)entity) | ||
| - .filter(LivingEntity::isAlive) | ||
| - .filter(v -> competesForSameJobsite(globalPos, poi, v)) | ||
| - .reduce(villager, PoiCompetitorScan::selectWinner) | ||
| + // Paper start - Improve performance of PoiCompetitorScan by unrolling stream | ||
| + // The previous logic used Stream#reduce to simulate a form of single-iteration bubble sort | ||
| + // in which the "winning" villager would maintain MemoryModuleType.JOB_SITE while all others | ||
| + // would lose said memory module type by passing each "current winner" and incoming next | ||
| + // villager to #selectWinner. | ||
| + poi -> { | ||
| + final List<LivingEntity> livingEntities = instance.get(nearestLivingEntities); | ||
| + | ||
| + Villager winner = villager; | ||
| + for (final LivingEntity other : livingEntities) { | ||
| + if (other == villager) { | ||
| + continue; | ||
| + } | ||
| + if (!(other instanceof final net.minecraft.world.entity.npc.Villager otherVillager)) { | ||
| + continue; | ||
| + } | ||
| + if (!other.isAlive()) { | ||
| + continue; | ||
| + } | ||
| + if (!competesForSameJobsite(globalPos, poi, otherVillager)) { | ||
| + continue; | ||
| + } | ||
| + winner = selectWinner(winner, otherVillager); | ||
| + } | ||
| + } | ||
| + // Paper end - Improve performance of PoiCompetitorScan by unrolling stream | ||
| ); | ||
| return true; | ||
| } |