SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.17

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/nms-patches/net/minecraft/world/level/RayTrace.patch
View File

@@ -1,20 +1,20 @@
--- a/net/minecraft/world/level/RayTrace.java
+++ b/net/minecraft/world/level/RayTrace.java
@@ -24,7 +24,7 @@
this.b = vec3d1;
this.c = raytrace_blockcollisionoption;
this.d = raytrace_fluidcollisionoption;
- this.e = VoxelShapeCollision.a(entity);
+ this.e = (entity == null) ? VoxelShapeCollision.a() : VoxelShapeCollision.a(entity); // CraftBukkit
this.to = vec3d1;
this.block = raytrace_blockcollisionoption;
this.fluid = raytrace_fluidcollisionoption;
- this.collisionContext = VoxelShapeCollision.a(entity);
+ this.collisionContext = (entity == null) ? VoxelShapeCollision.a() : VoxelShapeCollision.a(entity); // CraftBukkit
}
public Vec3D a() {
@@ -53,7 +53,7 @@
@@ -69,7 +69,7 @@
private final Predicate<Fluid> predicate;
private final Predicate<Fluid> canPick;
- private FluidCollisionOption(Predicate predicate) {
+ private FluidCollisionOption(Predicate<Fluid> predicate) { // CraftBukkit - decompile error
this.predicate = predicate;
this.canPick = predicate;
}