Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
21faf822 Implement optional per player mobspawning (#2171)
88722ec8 Prevent consuming the wrong itemstack (#2477)
294e3046 Async chunk api/io/loading (#2308)
This commit is contained in:
William Blake Galbreath
2019-08-22 13:16:02 -05:00
parent 5b4de6e7e8
commit 8dbd6295e7
24 changed files with 88 additions and 4470 deletions

View File

@@ -1,4 +1,4 @@
From 096f2f316f27ddf82c1575dc13fc1d80f3346541 Mon Sep 17 00:00:00 2001
From 263a96137b30b81c1887e968d3e224fe0bf450a0 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 8c59692b2..d375069f3 100644
index af3c7e595..f9469e9e7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1073,7 +1073,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1079,7 +1079,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {
@@ -21,5 +21,5 @@ index 8c59692b2..d375069f3 100644
@Override
--
2.20.1
2.23.0.rc1