From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 9 Aug 2021 00:38:37 -0400 Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 468fffe6dbecbf276fbcac92a3345625b5218f34..d838e884564e2763a6918a1a778a91c84f498649 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3508,26 +3508,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } private Stream getIndirectPassengersStream() { + if (this.passengers.isEmpty()) { return Stream.of(); } // Paper return this.passengers.stream().flatMap(Entity::getSelfAndPassengers); } @Override public Stream getSelfAndPassengers() { + if (this.passengers.isEmpty()) { return Stream.of(this); } // Paper return Stream.concat(Stream.of(this), this.getIndirectPassengersStream()); } @Override public Stream getPassengersAndSelf() { + if (this.passengers.isEmpty()) { return Stream.of(this); } // Paper return Stream.concat(this.passengers.stream().flatMap(Entity::getPassengersAndSelf), Stream.of(this)); } public Iterable getIndirectPassengers() { + // Paper start - rewrite this method + if (this.passengers.isEmpty()) { return ImmutableList.of(); } + ImmutableList.Builder indirectPassengers = ImmutableList.builder(); + for (Entity passenger : this.passengers) { + indirectPassengers.add(passenger); + indirectPassengers.addAll(passenger.getIndirectPassengers()); + } + return indirectPassengers.build(); + } + private Iterable getIndirectPassengers_old() { + // Paper end return () -> { return this.getIndirectPassengersStream().iterator(); }; } public boolean hasExactlyOnePlayerPassenger() { + if (this.passengers.isEmpty()) { return false; } // Paper return this.getIndirectPassengersStream().filter((entity) -> { return entity instanceof Player; }).count() == 1L;