Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4df3dad8 Reduce PlayerNaturallySpawnCreaturesEvent calls
This commit is contained in:
William Blake Galbreath
2020-03-01 19:55:49 -06:00
parent 6f0bd3a6cf
commit 024dc406b8
5 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From c2e70240753bdc84eb8b3467657b8760ffa01193 Mon Sep 17 00:00:00 2001
From 89ad75d591ff610897e8473cb51db36c1dd793a5 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 670dcf2829..b2dbeb0b0a 100644
index 1b5140a357..66ac64d1fc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1098,7 +1098,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1100,7 +1100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {