Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
48b6bfe2 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-23 16:16:17 -05:00
parent c2720f58c2
commit 917620e80d
9 changed files with 33 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
From f0db1af8a2684f960674e4314a4e560eb492b015 Mon Sep 17 00:00:00 2001
From 6f8989fe5f0b31e34732a75629fd21faf197287c 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 20326f1907..68900c52a4 100644
index 8c59692b2b..d375069f33 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1074,7 +1074,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1073,7 +1073,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {