Update Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
Ben Kerllenevich
2021-08-31 07:23:46 -04:00
parent 64547876a0
commit 19293aabc5
36 changed files with 113 additions and 113 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0a1ca98b993a65b3c267e1722bd7846efd4cd6d0..498ffb2aa24e6464f567999a6a941b2cb334e002 100644
index d946d334af4354be0f23eee40f2723fb414bb844..c07ab3ec326bd43f857324679a4dae482b40b392 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -794,7 +794,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -799,7 +799,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public void checkOutOfWorld() {
// Paper start - Configurable nether ceiling damage