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 e7dd733265b62aea814573a16366d94c82c89e2c Mon Sep 17 00:00:00 2001
From 16066e973580d0b1fc87d9f012fcfde6a914e644 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 2d2c916e5..8565ad9c7 100644
index bcab00c068..f7df54228d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1066,7 +1066,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1092,7 +1092,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {