Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5dc6bd45 Optimize call to getFluid for explosions (#2859)
0f795c3e Updated Upstream (CraftBukkit)
1d5bd44d Fix entity teleportation exceptions
bd0337b7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
654a1316 Add more chunk debug to watchdog (#2851)
This commit is contained in:
William Blake Galbreath
2020-01-14 19:46:20 -06:00
parent 6a70fc621d
commit e4b55a3da2
7 changed files with 24 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
From 4d5c94e0ea52dc2263cb38f10d14bbebae9c84e3 Mon Sep 17 00:00:00 2001
From 960b344bea7f6abfdc7a0ba38c2db059019dd5a0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -115,7 +115,7 @@ index 1d9ba04daa..2bade947ee 100644
this.d = false;
this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 647fc4b0e2..c40d3b56b1 100644
index cd3ea3359f..5e3b8278bb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -175,7 +175,7 @@ index 647fc4b0e2..c40d3b56b1 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3361,4 +3376,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3369,4 +3384,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}