Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2b4ce0b37 Restore incremental player saving
This commit is contained in:
William Blake Galbreath
2020-08-16 10:00:17 -05:00
parent 9a376d0423
commit e1abdd5ab5
12 changed files with 42 additions and 42 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3ccfc969f..4f8042a48 100644
index abb929e1bf..6a8022f01a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1243,7 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1244,7 +1244,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {