Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
f177f878 Full chunk debug on incremental watchdog (#2868)
c2954557 Fix last firework in stack not having effects when dispensed - #2871 (#2876)
dd8b8df0 Ensure portal search radius is used when teleporting players (#2877)
This commit is contained in:
William Blake Galbreath
2020-01-18 11:55:13 -06:00
parent 04686a66b8
commit ab2c6c147e
5 changed files with 23 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
From 16066e973580d0b1fc87d9f012fcfde6a914e644 Mon Sep 17 00:00:00 2001
From ffdf3c98b94794ee51cb65db5ac085e7a6271fde 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 bcab00c068..f7df54228d 100644
index 4c1ccdd6f..df20e5706 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1092,7 +1092,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1094,7 +1094,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {