Port collision optimisation patch from Moonrise

Drop random ticking optimisation for now

1 files changed, 3 insertions, 3 deletions

diff --git a/patches/server/1011-Optimize-Voxel-Shape-Merging.patch b/patches/server/1011-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..114ee7cb28 100644
--- a/patches/server/1011-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1011-Optimize-Voxel-Shape-Merging.patch
@@ -68,10 +68,10 @@ index e164c524aef4fa81fe96ac43454eecff1c38b9c1..9cfbbc61fcfc678f0988d6d45c7994d1
          this.firstIndices = new int[k];
          this.secondIndices = new int[k];
 diff --git a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
-index 0fdd2cdd8d215ca1523eda8ad7316cdd5f41a6b5..86df4ef44d0a5107ee929dfd40d8ccb0779e8bfc 100644
+index 7ede56f77af1d40e10fde2e660d5794e4b37dc5d..c348171c150bf69d24303d0862e45ab78baddcab 100644
 --- a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
 +++ b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
-@@ -286,9 +286,21 @@ public final class Shapes {
+@@ -343,9 +343,21 @@ public final class Shapes {
      }
  
      @VisibleForTesting
@@ -94,7 +94,7 @@ index 0fdd2cdd8d215ca1523eda8ad7316cdd5f41a6b5..86df4ef44d0a5107ee929dfd40d8ccb0
          if (first instanceof CubePointRange && second instanceof CubePointRange) {
              long l = lcm(i, j);
              if ((long)size * l <= 256L) {
-@@ -296,15 +308,22 @@ public final class Shapes {
+@@ -353,15 +365,22 @@ public final class Shapes {
              }
          }