add remapped patches as a testsoftspoon

1 files changed, 20 insertions, 0 deletions

diff --git a/patch-remap/og/net/minecraft/world/level/RayTrace.patch b/patch-remap/og/net/minecraft/world/level/RayTrace.patch
new file mode 100644
index 0000000000..c6598f3aa2
--- /dev/null
+++ b/patch-remap/og/net/minecraft/world/level/RayTrace.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/world/level/RayTrace.java
++++ b/net/minecraft/world/level/RayTrace.java
+@@ -22,7 +22,7 @@
+     private final VoxelShapeCollision collisionContext;
+ 
+     public RayTrace(Vec3D vec3d, Vec3D vec3d1, RayTrace.BlockCollisionOption raytrace_blockcollisionoption, RayTrace.FluidCollisionOption raytrace_fluidcollisionoption, Entity entity) {
+-        this(vec3d, vec3d1, raytrace_blockcollisionoption, raytrace_fluidcollisionoption, VoxelShapeCollision.of(entity));
++        this(vec3d, vec3d1, raytrace_blockcollisionoption, raytrace_fluidcollisionoption, (entity == null) ? VoxelShapeCollision.empty() : VoxelShapeCollision.of(entity)); // CraftBukkit
+     }
+ 
+     public RayTrace(Vec3D vec3d, Vec3D vec3d1, RayTrace.BlockCollisionOption raytrace_blockcollisionoption, RayTrace.FluidCollisionOption raytrace_fluidcollisionoption, VoxelShapeCollision voxelshapecollision) {
+@@ -79,7 +79,7 @@
+ 
+         private final Predicate<Fluid> canPick;
+ 
+-        private FluidCollisionOption(Predicate predicate) {
++        private FluidCollisionOption(Predicate<Fluid> predicate) { // CraftBukkit - decompile error
+             this.canPick = predicate;
+         }
+