Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -0,0 +1,20 @@
--- a/net/minecraft/server/RayTrace.java
+++ b/net/minecraft/server/RayTrace.java
@@ -15,7 +15,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
}
public Vec3D a() {
@@ -44,7 +44,7 @@
private final Predicate<Fluid> predicate;
- private FluidCollisionOption(Predicate predicate) {
+ private FluidCollisionOption(Predicate<Fluid> predicate) { // CraftBukkit - decompile error
this.predicate = predicate;
}