diff options
| author | Jake Potrebic <[email protected]> | 2024-04-12 10:52:15 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-04-12 10:52:15 -0700 |
| commit | badf407f77bf2e698b25b4fb3ed4085bdc12c104 (patch) | |
| tree | f51cfd6a5fe0ac6527d17b2a4e9fcc875a8ed5a2 | |
| parent | d873219e46cf5d522d834464965e7b0d4e526e6a (diff) | |
| download | Paper-badf407f77bf2e698b25b4fb3ed4085bdc12c104.tar.gz Paper-badf407f77bf2e698b25b4fb3ed4085bdc12c104.zip | |
more fixes
| -rw-r--r-- | patches/server/0006-MC-Dev-fixes.patch | 4 | ||||
| -rw-r--r-- | patches/server/1015-Collision-optimisations.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index 9015aa59a2..671908dd6b 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -27,7 +27,7 @@ index 1a4cab0b9995b733aa84b89129009a99177eee9b..ead823fa2a143acb05b33152ee1e5ee4 } }; diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -index d14613f7d37198276c251e73703b060a971fac28..a6d8aca7533ad9a556d80b6dafdd93f94a7c23d6 100644 +index d14613f7d37198276c251e73703b060a971fac28..e8afaa3c1fab0435acb068426091bdf776263112 100644 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java @@ -307,7 +307,7 @@ public class BuiltInRegistries { @@ -35,7 +35,7 @@ index d14613f7d37198276c251e73703b060a971fac28..a6d8aca7533ad9a556d80b6dafdd93f9 ResourceLocation resourceLocation = key.location(); LOADERS.put(resourceLocation, () -> initializer.run(registry)); - WRITABLE_REGISTRY.register((ResourceKey<WritableRegistry<?>>)key, registry, lifecycle); -+ WRITABLE_REGISTRY.register((ResourceKey)key, registry, lifecycle); ++ WRITABLE_REGISTRY.register((ResourceKey)key, registry, lifecycle); // Paper - decompile fix return registry; } diff --git a/patches/server/1015-Collision-optimisations.patch b/patches/server/1015-Collision-optimisations.patch index 1d0d846bfb..0842071c33 100644 --- a/patches/server/1015-Collision-optimisations.patch +++ b/patches/server/1015-Collision-optimisations.patch @@ -2466,7 +2466,7 @@ index ffa4f34d964fbcc53e2dfe11677832db21a6eb93..7618364e5373fe17cfe45a5a4ee9ab25 } diff --git a/src/main/java/net/minecraft/world/level/BlockCollisions.java b/src/main/java/net/minecraft/world/level/BlockCollisions.java -index cd89623a44f02d7db77f0d0f87545cf80841f403..068c65fc7366b22b4a6fe10f4680637f14f4635f 100644 +index cd89623a44f02d7db77f0d0f87545cf80841f403..c9dcd5c72636844a7f012fc52b70c1d9773e833a 100644 --- a/src/main/java/net/minecraft/world/level/BlockCollisions.java +++ b/src/main/java/net/minecraft/world/level/BlockCollisions.java @@ -99,7 +99,7 @@ public class BlockCollisions<T> extends AbstractIterator<T> { @@ -2474,7 +2474,7 @@ index cd89623a44f02d7db77f0d0f87545cf80841f403..068c65fc7366b22b4a6fe10f4680637f VoxelShape voxelShape = blockState.getCollisionShape(this.collisionGetter, this.pos, this.context); if (voxelShape == Shapes.block()) { - if (this.box.intersects((double)i, (double)j, (double)k, (double)i + 1.0, (double)j + 1.0, (double)k + 1.0)) { -+ if (!io.papermc.paper.util.CollisionUtil.voxelShapeIntersect(this.box, (double)i, (double)j, (double)k, (double)i + 1.0D, (double)j + 1.0D, (double)k + 1.0D)) { // Paper - keep vanilla behavior for voxelshape intersection - See comment in CollisionUtil ++ if (io.papermc.paper.util.CollisionUtil.voxelShapeIntersect(this.box, (double)i, (double)j, (double)k, (double)i + 1.0D, (double)j + 1.0D, (double)k + 1.0D)) { // Paper - keep vanilla behavior for voxelshape intersection - See comment in CollisionUtil return this.resultProvider.apply(this.pos, voxelShape.move((double)i, (double)j, (double)k)); } } else { |