2021-08-13 00:55:41 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Andrew Steinborn <git@steinborn.me>
|
|
|
|
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
|
2021-12-20 23:46:51 +01:00
|
|
|
index 6970bb9951e83d5e1a76bad8ca4a7cb16d7fdd92..aa85a026b04f790dd9e4551f2ea3082bc076e04f 100644
|
2021-08-13 00:55:41 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-12-03 22:28:15 +01:00
|
|
|
@@ -3496,26 +3496,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
|
2021-08-13 00:55:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private Stream<Entity> getIndirectPassengersStream() {
|
|
|
|
+ if (this.passengers.isEmpty()) { return Stream.of(); } // Paper
|
2021-08-14 12:01:07 +02:00
|
|
|
return this.passengers.stream().flatMap(Entity::getSelfAndPassengers);
|
2021-08-13 00:55:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public Stream<Entity> getSelfAndPassengers() {
|
|
|
|
+ if (this.passengers.isEmpty()) { return Stream.of(this); } // Paper
|
|
|
|
return Stream.concat(Stream.of(this), this.getIndirectPassengersStream());
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public Stream<Entity> getPassengersAndSelf() {
|
|
|
|
+ if (this.passengers.isEmpty()) { return Stream.of(this); } // Paper
|
|
|
|
return Stream.concat(this.passengers.stream().flatMap(Entity::getPassengersAndSelf), Stream.of(this));
|
|
|
|
}
|
|
|
|
|
|
|
|
public Iterable<Entity> getIndirectPassengers() {
|
|
|
|
+ // Paper start - rewrite this method
|
|
|
|
+ if (this.passengers.isEmpty()) { return ImmutableList.of(); }
|
|
|
|
+ ImmutableList.Builder<Entity> indirectPassengers = ImmutableList.builder();
|
|
|
|
+ for (Entity passenger : this.passengers) {
|
|
|
|
+ indirectPassengers.add(passenger);
|
|
|
|
+ indirectPassengers.addAll(passenger.getIndirectPassengers());
|
|
|
|
+ }
|
|
|
|
+ return indirectPassengers.build();
|
|
|
|
+ }
|
|
|
|
+ private Iterable<Entity> 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;
|