OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 06:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

[ci skip] Fix param mismatch from last commit

Browse source
This commit is contained in:
Jason Penilla 2022-01-25 20:53:18 -07:00
parent f7dbd062e7
commit ca523abbdd
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
View file

@ -1194,7 +1194,7 @@ index 56d94c94fb0d4dc468bb5d69be655ddd5c6b5360..d7d396ad73866a97cd9f63b34ad8c587
List<VoxelShape> getEntityCollisions(@Nullable Entity entity, AABB box);
diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
index f9527d1d867f93b4e0e2758485cfa1f6efa0bf8b..566c1262fdf074b9ad6024a61eef973bba1d88fa 100644
index f9527d1d867f93b4e0e2758485cfa1f6efa0bf8b..1f4b72a0aca200b2e0860449c718e6e607d2fc47 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
@@ -50,7 +50,7 @@ public interface EntityGetter {
@ -1202,7 +1202,7 @@ index f9527d1d867f93b4e0e2758485cfa1f6efa0bf8b..566c1262fdf074b9ad6024a61eef973b
} else {
for(Entity entity : this.getEntities(except, shape.bounds())) {
- if (!entity.isRemoved() && entity.blocksBuilding && (except == null || !entity.isPassengerOfSameVehicle(except)) && Shapes.joinIsNotEmpty(shape, Shapes.create(entity.getBoundingBox()), BooleanOp.AND)) {
+ if (!entity.isRemoved() && entity.blocksBuilding && (entity == null || !entity.isPassengerOfSameVehicle(entity)) && shape.intersects(entity.getBoundingBox())) { // Paper
+ if (!entity.isRemoved() && entity.blocksBuilding && (except == null || !entity.isPassengerOfSameVehicle(except)) && shape.intersects(entity.getBoundingBox())) { // Paper
return false;
}
}