Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9205b75c Updated Upstream (CraftBukkit)
c32f8e13 PlayerDeathEvent#shouldDropExperience
05ecc314 Updated Upstream (CraftBukkit)
f8fd607e Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-12-23 22:17:27 -06:00
parent 074110faf7
commit ca55ab06f0
9 changed files with 55 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
From 9cf29811f1f450baf81e489fc07542d0440d8deb Mon Sep 17 00:00:00 2001
From 0835235b0f6fa6d2b7ac2b602477a93fbeeea26c 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 4ad6b48c25..563bf54f8b 100644
index 32ad1543b..4cb276eef 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1064,7 +1064,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1065,7 +1065,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {
@@ -21,5 +21,5 @@ index 4ad6b48c25..563bf54f8b 100644
@Override
--
2.24.0.rc1
2.24.0