merge Sakura check inside blocks optimizations (#542)

* merge Sakura check inside blocks

* add end comment

* [ci/skip] Reorder patches

Author: hayanesuru

…es/0291-optimize-checkInsideBlocks.patch …es/0264-optimize-checkInsideBlocks.patchleaf-server/minecraft-patches/features/0291-optimize-checkInsideBlocks.patch renamed to leaf-server/minecraft-patches/features/0264-optimize-checkInsideBlocks.patch leaf-server/minecraft-patches/features/0291-optimize-checkInsideBlocks.patch renamed to leaf-server/minecraft-patches/features/0264-optimize-checkInsideBlocks.patch

@@ -5,10 +5,15 @@ Subject: [PATCH] optimize checkInsideBlocks
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4689764a580d7dca468cdfa2b0fef7e70c57687f..e4c2c0b4ea2b153266c2bb35574167364029bc7c 100644
+index ea137958c70f80349041cd27d1503f7b8def2a69..a198c696e474372f49706b2758879b116cf9bc82 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1723,72 +1723,57 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1700,76 +1700,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         }
+     }
+ 
+-    // Leaf start - optimize checkInsideBlocks calls
++    // Leaf start - optimize checkInsideBlocks
      private void checkInsideBlocks(Vec3 vec3, Vec3 vec31, InsideBlockEffectApplier.StepBasedCollector stepBasedCollector, LongSet set) {
          final Level level = this.level();
          AABB aabb = this.getBoundingBox().move(vec31.subtract(this.position())).deflate(1.0E-5F);
@@ -115,7 +120,7 @@ index 4689764a580d7dca468cdfa2b0fef7e70c57687f..e4c2c0b4ea2b153266c2bb3557416736
          );
      }
 -// Leaf end - optimize checkInsideBlocks calls
-+    // Leaf end - optimize checkInsideBlocks calls
++    // Leaf end - optimize checkInsideBlocks
 
      private void debugBlockIntersection(BlockPos blockPos, boolean flag, boolean flag1) {
      }
@@ -202,14 +207,14 @@ index 92b9c324cb6aab415abe2e77c5844b74c251a42f..eba3896b73c70f29732388373e89bf7c
 
          // Paper start - track position inside effect was triggered on
 diff --git a/net/minecraft/world/level/BlockGetter.java b/net/minecraft/world/level/BlockGetter.java
-index eeddffbe6a47dc1a42c07f286bfec0cbde33fc17..b0da274c944fcef6aaae39b43f05a79110e4bb16 100644
+index eeddffbe6a47dc1a42c07f286bfec0cbde33fc17..b953bbccbbc357724adf8f368ad5893fcbd635fc 100644
 --- a/net/minecraft/world/level/BlockGetter.java
 +++ b/net/minecraft/world/level/BlockGetter.java
-@@ -255,6 +255,81 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -255,6 +255,90 @@ public interface BlockGetter extends LevelHeightAccessor {
          }
      }
 
-+    // Leaf start
++    // Leaf start - optimize checkInsideBlocks
 +    static boolean leaf$forEachBlockIntersectedBetween(it.unimi.dsi.fastutil.longs.LongSet set, Vec3 from, Vec3 to, AABB boundingBox, BlockGetter.BlockStepVisitor visitor) {
 +        Vec3 vec3 = to.subtract(from);
 +        BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
@@ -243,46 +248,55 @@ index eeddffbe6a47dc1a42c07f286bfec0cbde33fc17..b0da274c944fcef6aaae39b43f05a791
 +            }
 +
 +            return true;
++        }
++        int i;
++        final boolean xZero = vec3.x == 0.0;
++        final boolean yZero = vec3.y == 0.0;
++        final boolean zZero = vec3.z == 0.0;
++        if (xZero && yZero || yZero && zZero || xZero && zZero) {
++            i = 0;
++            double fac = Math.min(16.0 / vec3.length(), 1.0);
++            boundingBox = boundingBox.move(-vec3.x, -vec3.y, -vec3.z)
++                .expandTowards(vec3.x * fac, vec3.y * fac, vec3.z * fac);
 +        } else {
 +            Vec3 minPosition = boundingBox.getMinPosition();
 +            Vec3 vec31 = minPosition.subtract(vec3);
-+            int i = addCollisionsAlongTravel(set, vec31, minPosition, boundingBox, visitor);
++            i = addCollisionsAlongTravel(set, vec31, minPosition, boundingBox, visitor);
 +            if (i < 0) {
 +                return false;
-+            } else {
-+                int pos1x = Mth.floor(boundingBox.minX);
-+                int pos1y = Mth.floor(boundingBox.minY);
-+                int pos1z = Mth.floor(boundingBox.minZ);
-+                int pos2x = Mth.floor(boundingBox.maxX);
-+                int pos2y = Mth.floor(boundingBox.maxY);
-+                int pos2z = Mth.floor(boundingBox.maxZ);
-+                int x1 = Math.min(pos1x, pos2x);
-+                int y1 = Math.min(pos1y, pos2y);
-+                int z1 = Math.min(pos1z, pos2z);
-+                int j = Math.max(pos1x, pos2x) - x1 + 1;
-+                int i1 = Math.max(pos1y, pos2y) - y1 + 1;
-+                int i2 = Math.max(pos1z, pos2z) - z1 + 1;
-+                int i3 = j * i1 * i2;
-+                int index = 0;
-+                while (index != i3) {
-+                    int i4 = index % j;
-+                    int i5 = index / j;
-+                    int i6 = i5 % i1;
-+                    int i7 = i5 / i1;
-+                    index++;
-+                    int x0 = x1 + i4;
-+                    int y0 = y1 + i6;
-+                    int z0 = z1 + i7;
-+                    if (set.add(BlockPos.asLong(x0, y0, z0)) && !visitor.visit(cursor.set(x0, y0, z0), i + 1)) {
-+                        return false;
-+                    }
-+                }
-+
-+                return true;
 +            }
 +        }
++        int pos1x = Mth.floor(boundingBox.minX);
++        int pos1y = Mth.floor(boundingBox.minY);
++        int pos1z = Mth.floor(boundingBox.minZ);
++        int pos2x = Mth.floor(boundingBox.maxX);
++        int pos2y = Mth.floor(boundingBox.maxY);
++        int pos2z = Mth.floor(boundingBox.maxZ);
++        int x1 = Math.min(pos1x, pos2x);
++        int y1 = Math.min(pos1y, pos2y);
++        int z1 = Math.min(pos1z, pos2z);
++        int j = Math.max(pos1x, pos2x) - x1 + 1;
++        int i1 = Math.max(pos1y, pos2y) - y1 + 1;
++        int i2 = Math.max(pos1z, pos2z) - z1 + 1;
++        int i3 = j * i1 * i2;
++        int index = 0;
++        while (index != i3) {
++            int i4 = index % j;
++            int i5 = index / j;
++            int i6 = i5 % i1;
++            int i7 = i5 / i1;
++            index++;
++            int x0 = x1 + i4;
++            int y0 = y1 + i6;
++            int z0 = z1 + i7;
++            if (set.add(BlockPos.asLong(x0, y0, z0)) && !visitor.visit(cursor.set(x0, y0, z0), i + 1)) {
++                return false;
++            }
++        }
++
++        return true;
 +    }
-+    // Leaf end
++    // Leaf end - optimize checkInsideBlocks
 +
      private static int addCollisionsAlongTravel(LongSet output, Vec3 from, Vec3 to, AABB boundingBox, BlockGetter.BlockStepVisitor stepVisitor) {
          Vec3 vec3 = to.subtract(from);